| commit | 754b249bcd2d72b90b4fbe82d0d9b636790717df | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Wed Aug 17 14:38:15 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 17 14:38:15 2011 -0700 |
| tree | 7d882a982ef974e6e098e6cad1144227459cca3a | |
| parent | c9514d2dadbedc6ac1023dd1072f18a2ace7cf9b [diff] | |
| parent | 242915f3d017582186eeebd8bd341a4290e31ff8 [diff] |
am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work" * commit '5dcda1fda53bdc6dfe80cf37e62cacdc216224b1': Fix String16 operator+ to actually work
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; }