summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorSteve Howard <showard@google.com>2010-09-14 17:48:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-14 17:48:30 -0700
commitecd0581146e24afe4482ba7c6998c7579773e554 (patch)
tree1b4d284d76610faa682262216e18d7956df073d7 /opengl/tests/gl_basic/gl_basic.cpp
parent8fb81284c29ce4e6a3829d2793bfd36cad958797 (diff)
parent7880a38a6eda34cd90d5bf40269c7445c9f24113 (diff)
am 536ee090: Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread
Merge commit '536ee090ef75add0f7244c1c22be83fe03a66010' into gingerbread-plus-aosp * commit '536ee090ef75add0f7244c1c22be83fe03a66010': Fix name shadowing bug with revoking URI permissions.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions