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

* commit 'ddf155b8338eb894a97612e4cb21257c11d8434a':
  Fix String16 operator+ to actually work
This commit is contained in:
Xavier Ducrohet 2011-08-17 14:40:57 -07:00 committed by Android Git Automerger
commit de16a5a62b

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;
}