| commit | fcdafba030a21afcfccaca0b093f0f92db8de54f | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Wed Aug 17 16:45:23 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 17 16:45:23 2011 -0700 |
| tree | 2f06895b65f4ac39ab94063b8562ed72879a30d9 | |
| parent | 8e044f11eb833304bdc56dd121437b388c5c570b [diff] | |
| parent | 3902be629bd94de62db0039004d0b25556227cbf [diff] |
Merge "fix a small race condition when returning the default width/height of a SurfaceTexture"
diff --git a/include/utils/String16.h b/include/utils/String16.h index 584f53f..360f407 100644 --- a/include/utils/String16.h +++ b/include/utils/String16.h
@@ -156,7 +156,7 @@ inline String16 String16::operator+(const String16& other) const { - String16 tmp; + String16 tmp(*this); tmp += other; return tmp; }