summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-09-01 23:17:20 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-01 23:17:20 -0700
commit58d1e77692a7bfa7b37c2a86a7991e0ca84d684e (patch)
tree5a438d33fa40180d101fc1ad648ae2e7d3acbe3c /opengl/tests/gl_basic/gl_basic.cpp
parentc7da777a38f5dd060c0cbb5ef33b3f4c18c57201 (diff)
parentf1f5b58ce5bb31080b9198f04c3654007ce0532f (diff)
am a1c69e08: Fix a small bug when granting permissions through activity results.
Merge commit 'a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4' into gingerbread-plus-aosp * commit 'a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4': Fix a small bug when granting permissions through activity results.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions