| commit | 242915f3d017582186eeebd8bd341a4290e31ff8 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Wed Aug 17 14:35:20 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 17 14:35:20 2011 -0700 |
| tree | 1a004e7b12ce9e5bf2c3023e3e282d6c2cbd2373 | |
| parent | bf046a8e05a3f699ec656a5cf4fde08ffc3fc78d [diff] | |
| parent | 35302266fa2cadb23e2b5005943b6f63372b7ab8 [diff] |
am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work" * commit '88512f59bc051a42f4dd70acc8af5622f7e99db6': Fix String16 operator+ to actually work
diff --git a/include/utils/String16.h b/include/utils/String16.h index 07a0c11..9d8be38 100644 --- a/include/utils/String16.h +++ b/include/utils/String16.h
@@ -183,7 +183,7 @@ inline String16 String16::operator+(const String16& other) const { - String16 tmp; + String16 tmp(*this); tmp += other; return tmp; }