diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-01-20 11:31:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-20 11:31:10 -0800 |
| commit | a64f899fa6159a8839a769d3f107f6c502da58c8 (patch) | |
| tree | 35f47ea999bc229901e249893e37a69bc1eff2dd /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1bc82792b87c0aee65c53f84a6d7c6b5031a09bc (diff) | |
| parent | 4d3161f379195302b720e120c5e6b65a0adfaf8c (diff) | |
am 4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1
* commit '4d3161f379195302b720e120c5e6b65a0adfaf8c':
Always show appropriate mobile service label.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions