summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-08-31 14:25:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-31 14:25:25 -0700
commit39f3fcbdb5ee6b3c16718817ab4155ba29c6059d (patch)
tree380bbbb1666ddbc975f210f8d47912363440eed0 /opengl/tests/gl_basic/gl_basic.cpp
parent5ddac9512f2f9904ed68cdea53602f3327bc2b24 (diff)
parentd0b0300100837edf3f337a267d2ece29c94a956a (diff)
am b7ab3420: Ignore changes from open-source master that are already here
Merge commit 'b7ab342016bd622b30e1945b16b24413ae82ac54' * commit 'b7ab342016bd622b30e1945b16b24413ae82ac54': GPS: Initialize XTRA support when GPS is enabled GPS: Don't set XTRA download pending flag at boot time.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions