summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-09-20 22:22:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-20 22:22:54 -0700
commita13253d0b43ad8f6c042ce6416cd03b48968e452 (patch)
tree7d0f7ca035d28794849b31df6f339e41ce6bee2c /opengl/tests/gl_basic/gl_basic.cpp
parent55d51aed829a03c8cbdbcacd0d2537b912b654c3 (diff)
parente228f82f6a059c2f40831791467b85a9c158e4b0 (diff)
am 51aaab3d: Merge "Fix #2999258: ANR in Settings after every reboot" into gingerbread
Merge commit '51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d' into gingerbread-plus-aosp * commit '51aaab3d6ba01263c3e1d81ca0567e0ad5cddb2d': Fix #2999258: ANR in Settings after every reboot
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions