summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorRobert Greenwalt <robdroid@android.com>2012-01-12 09:29:30 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-12 09:29:30 -0800
commit8df26f89d8c4c4848e3e83cb67f5d67d535b678f (patch)
tree12823493d1b9718500ad69feb1d6670900863b88 /opengl/tests/gl_basic/gl_basic.cpp
parent693628ea2c072478a1691ce841b1aefd9470673d (diff)
parent6215e2f1332f8db718afd5d98b8bbe0f051591cb (diff)
am 1800ccfa: am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1
* commit '1800ccfa647cca6e9c051759312d6af12f134f5a': Disable wimax when mobile data is in Settings
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions