summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJustin Ho <justinho@google.com>2012-01-06 14:09:59 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-06 14:09:59 -0800
commit7db47a42f1211befb015a7a9640f0c447b477228 (patch)
tree3aadcebf4aa04f99f58029f135820369c2427f10 /opengl/tests/gl_basic/gl_basic.cpp
parent47228cac900cd58d0687b6e6d980381cfc8010a1 (diff)
parent3116b7a7ca6681daabbdac55e71203995e7a7afe (diff)
am 3116b7a7: Merge "Updating default image wallpaper for tablet." into ics-mr1
* commit '3116b7a7ca6681daabbdac55e71203995e7a7afe': Updating default image wallpaper for tablet.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions