summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2012-01-24 12:57:14 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-24 12:57:14 -0800
commit08c109508e3da9ac2dd47068c3d1c983c51470e3 (patch)
tree62ae95e5606b65456e4877a437dfcb3020b7cee1 /opengl/tests/gl_basic/gl_basic.cpp
parent321400743abde3d771a9b497fceccf2376c782b3 (diff)
parent4ca203ab4499fbc3cd930bc380dd7ca69f76b8b9 (diff)
am 185c0ef7: Merge "Stop showing "No internet connection" when there is one." into ics-mr1
* commit '185c0ef7e4aaa4bb978a6eb5c93c569585a07f56': Stop showing "No internet connection" when there is one.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions