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

* commit 'a8313e71fe8b483448d14e22610101c5f3672744':
  Fix String16 operator+ to actually work
This commit is contained in:
Xavier Ducrohet 2011-08-17 14:31:08 -07:00 committed by Android Git Automerger
commit 35302266fa

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