commit de16a5a62ba218efaf829e9fed0cdf4b175c343b
author Xavier Ducrohet <xav@android.com> Wed Aug 17 14:40:57 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 17 14:40:57 2011 -0700
tree d77c6a7dfefd04ae9226850a1ee3a0b6d18dcf46
parent 22cf25cba6454395f34bd5bf779d7ac161d350a6
parent 754b249bcd2d72b90b4fbe82d0d9b636790717df

am ddf155b8: am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"

* commit 'ddf155b8338eb894a97612e4cb21257c11d8434a':
  Fix String16 operator+ to actually work

include/utils/String16.h

diff --git a/include/utils/String16.h b/include/utils/String16.h
index 584f53f..360f407 100644
--- a/include/utils/String16.h
+++ b/include/utils/String16.h
@@ -156,7 +156,7 @@
 
 inline String16 String16::operator+(const String16& other) const
 {
-    String16 tmp;
+    String16 tmp(*this);
     tmp += other;
     return tmp;
 }