summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2010-09-29 13:43:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-29 13:43:28 -0700
commit16f1ddba0f18c7a5758a587cd6e1470125fdca09 (patch)
tree98c2aa54138fd908e08466ccfb8567ddb09e10bf /opengl/tests/gl_basic/gl_basic.cpp
parentc2a23c1a0420e5f9edd18468abf7a4f9225886c6 (diff)
parent8a6b6a4a4b74dbfd2fa8ba2e4438362d82592ca5 (diff)
am 981dec69: Merge "don\'t delete /cache/recovery/last_log on boot" into gingerbread
Merge commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4' into gingerbread-plus-aosp * commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4': don't delete /cache/recovery/last_log on boot
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions