summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2010-04-02 12:51:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-02 12:51:05 -0700
commit65e79b2e6bd6feb3ac748cb4408a72af92b9e846 (patch)
treecdbf9768a271b0e0c930e042bbf7359082ffb896 /opengl/tests/gl_basic/gl_basic.cpp
parent1ec78f0ce3e7aefa9555dc4d7b57d5ee8dd60ee6 (diff)
parent5cbb4dc9f71354b4da9c0f08c639f2f1c5373380 (diff)
am 9c50996b: Merge "Dont start wifi if in airplane mode" into froyo
Merge commit '9c50996b175a1ee4b0069cba5163310c0189ac36' into froyo-plus-aosp * commit '9c50996b175a1ee4b0069cba5163310c0189ac36': Dont start wifi if in airplane mode
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions