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

* commit '88512f59bc051a42f4dd70acc8af5622f7e99db6':
  Fix String16 operator+ to actually work
This commit is contained in:
Xavier Ducrohet 2011-08-17 14:35:20 -07:00 committed by Android Git Automerger
commit 242915f3d0

View File

@ -183,7 +183,7 @@ inline String16& String16::operator+=(const String16& other)
inline String16 String16::operator+(const String16& other) const
{
String16 tmp;
String16 tmp(*this);
tmp += other;
return tmp;
}