diff options
| 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 |
| commit | 754b249bcd2d72b90b4fbe82d0d9b636790717df (patch) | |
| tree | 7d882a982ef974e6e098e6cad1144227459cca3a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c9514d2dadbedc6ac1023dd1072f18a2ace7cf9b (diff) | |
| parent | 242915f3d017582186eeebd8bd341a4290e31ff8 (diff) | |
am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"
* commit '5dcda1fda53bdc6dfe80cf37e62cacdc216224b1':
Fix String16 operator+ to actually work
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions