diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-08-17 14:40:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-08-17 14:40:57 -0700 |
| commit | de16a5a62ba218efaf829e9fed0cdf4b175c343b (patch) | |
| tree | d77c6a7dfefd04ae9226850a1ee3a0b6d18dcf46 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 22cf25cba6454395f34bd5bf779d7ac161d350a6 (diff) | |
| parent | 754b249bcd2d72b90b4fbe82d0d9b636790717df (diff) | |
am ddf155b8: am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"
* commit 'ddf155b8338eb894a97612e4cb21257c11d8434a':
Fix String16 operator+ to actually work
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions