diff options
| author | Kenny Root <kroot@google.com> | 2010-08-06 18:53:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-06 18:53:48 -0700 |
| commit | d0be18bd4ecb26ef94c3c5b5cb5f0d24eb34d2a2 (patch) | |
| tree | 509b165a9c92abd77498666313483d9216648e5b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e3be33998d19ae9a3a75a81289c8b4cd553e784b (diff) | |
| parent | aa966638b9428e78837eff93ef29f10f31193256 (diff) | |
am 818490ab: Fix String8::operator+
Merge commit '818490ab2abe36dfc6c13d01fea5220bd64cca8c' into gingerbread-plus-aosp
* commit '818490ab2abe36dfc6c13d01fea5220bd64cca8c':
Fix String8::operator+
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions