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

* commit '5dcda1fda53bdc6dfe80cf37e62cacdc216224b1':
  Fix String16 operator+ to actually work
This commit is contained in:
Xavier Ducrohet
2011-08-17 14:38:15 -07:00
committed by Android Git Automerger

View File

@@ -156,7 +156,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;
}