am 88512f5: am a8313e7: Merge "Fix String16 operator+ to actually work"

Xavier Ducrohet · Android Git Automerger · commit 5dcda1fda53b · 2011-08-17T14:35:20.000-07:00
* commit '88512f59bc051a42f4dd70acc8af5622f7e99db6':
  Fix String16 operator+ to actually work
diff --git a/include/utils/String16.h b/include/utils/String16.h
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ inline String16& String16::operator+=(const String16& other)`
`183`	`183`
`184`	`184`	`inline String16 String16::operator+(const String16& other) const`
`185`	`185`	`{`
`186`		`- String16 tmp;`
	`186`	`+ String16 tmp(*this);`
`187`	`187`	`tmp += other;`
`188`	`188`	`return tmp;`
`189`	`189`	`}`