summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-08-17 14:31:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-08-17 14:31:08 -0700
commit35302266fa2cadb23e2b5005943b6f63372b7ab8 (patch)
tree5cc72f867b6e98530787f9493c47b5878d0d47f0 /include
parente0233e99cde408c883ff3ae28bd2a1be71af5cde (diff)
parent9f4d9d148f508ca69e78af25a258a826ab74ad22 (diff)
downloadframeworks_native-35302266fa2cadb23e2b5005943b6f63372b7ab8.zip
frameworks_native-35302266fa2cadb23e2b5005943b6f63372b7ab8.tar.gz
frameworks_native-35302266fa2cadb23e2b5005943b6f63372b7ab8.tar.bz2
am a8313e71: Merge "Fix String16 operator+ to actually work"
* commit 'a8313e71fe8b483448d14e22610101c5f3672744': Fix String16 operator+ to actually work
Diffstat (limited to 'include')
-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 07a0c11..9d8be38 100644
--- 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;
}