diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-08-17 14:31:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-08-17 14:31:08 -0700 |
| commit | 35302266fa2cadb23e2b5005943b6f63372b7ab8 (patch) | |
| tree | 5cc72f867b6e98530787f9493c47b5878d0d47f0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e0233e99cde408c883ff3ae28bd2a1be71af5cde (diff) | |
| parent | 9f4d9d148f508ca69e78af25a258a826ab74ad22 (diff) | |
am a8313e71: Merge "Fix String16 operator+ to actually work"
* commit 'a8313e71fe8b483448d14e22610101c5f3672744':
Fix String16 operator+ to actually work
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions