summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-05-12 07:49:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-12 07:49:45 -0700
commit0904bbd87a734b259176da2b69a8fe3cc29ce5bc (patch)
tree1da85f32dbecd5d62e79d5a68d57f0398547714b /opengl/tests/gl_basic/gl_basic.cpp
parent3469d55e9a74d68a43c1ba0909ebfdd79780e6a0 (diff)
parentc9797fed88dbd5796bc91801436d130fc53515c3 (diff)
am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo
Merge commit 'e1d7dca608ced72c75bf906c7267a1ef30349826' into froyo-plus-aosp * commit 'e1d7dca608ced72c75bf906c7267a1ef30349826': LocationManagerService: Call updateNetworkState on providers that are disabled.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions