summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2012-01-20 16:38:24 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-20 16:38:24 -0800
commite0e10b41c465a74749dcd1d05d8f4b688fcfdc3c (patch)
tree3e4215e571a278e1ee9e8a049a5f3b65ab9115e7 /opengl/tests/gl_basic/gl_basic.cpp
parent2af9ecfd1eb25bcb05e1afbf09412d30cbc3fb42 (diff)
parenta64f899fa6159a8839a769d3f107f6c502da58c8 (diff)
am a64f899f: am 4d3161f3: Merge "Always show appropriate mobile service label." into ics-mr1
* commit 'a64f899fa6159a8839a769d3f107f6c502da58c8': Always show appropriate mobile service label.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions