summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2012-01-26 15:47:06 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-26 15:47:06 -0800
commit3cef7405149a3e7de64d277dace58a382cbde9bd (patch)
treefd87915521324a08613ddbbd9863eb039af9fc21 /opengl/tests/gl_basic/gl_basic.cpp
parent7ac703fedfd9ef9d6ed43333681cb6a41c014da1 (diff)
parent9604fdcf94f7c83dc969cdb9aa669fd5efd8b7a9 (diff)
am 70828a1d: am 5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1
* commit '70828a1d40c9bf0e5066166216013093298de034': Suppress mobile-out-of-service label if wifi connected.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions