summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorXia Wang <xiaw@google.com>2010-04-07 10:32:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-07 10:32:38 -0700
commitf8f27eeccc9548cec4a03d898d73eabd0582ccf8 (patch)
treecdbf9768a271b0e0c930e042bbf7359082ffb896 /opengl/tests/gl_basic/gl_basic.cpp
parent31c09444e59a68f84e625f5444c6768e403a76de (diff)
parent9a3965f1f813e8fb237bfa3d87fc700331d0602c (diff)
am c93386ce: Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
Merge commit 'c93386cece18b8467c69004561e8f22b6b053d24' into froyo-plus-aosp * commit 'c93386cece18b8467c69004561e8f22b6b053d24': Fix bug2537659
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions