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

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

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ inline String16& String16::operator+=(const String16& other)`
`156`	`156`
`157`	`157`	`inline String16 String16::operator+(const String16& other) const`
`158`	`158`	`{`
`159`		`- String16 tmp;`
	`159`	`+ String16 tmp(*this);`
`160`	`160`	`tmp += other;`
`161`	`161`	`return tmp;`
`162`	`162`	`}`