summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Xavier Ducrohet <xav@android.com> 2011-08-17 14:38:15 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-08-17 14:38:15 -0700
commitddf155b8338eb894a97612e4cb21257c11d8434a (patch)
tree61b261474cdd94124eef612647faf6e542dbffda
parent51beb81a8e901020293b7a30a68b405bca71d258 (diff)
parent5dcda1fda53bdc6dfe80cf37e62cacdc216224b1 (diff)
am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"
* commit '5dcda1fda53bdc6dfe80cf37e62cacdc216224b1': Fix String16 operator+ to actually work
-rw-r--r--include/utils/String16.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/utils/String16.h b/include/utils/String16.h
index 584f53f30065..360f407c36b5 100644
--- 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;
}