summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2011-10-18 13:38:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-18 13:38:09 -0700
commit58da67c033a6b53555b302ddd57bc8b4e0cb886c (patch)
tree8de446341394ffb7368802e27c0c0d840d8e8229 /opengl/tests/gl_basic/gl_basic.cpp
parent3c1ccfe8571f138c3243227cf867c35b1b5dbf29 (diff)
parentc6512c062c37803e1f20e3ad18335dac097bac52 (diff)
am 07848843: Merge "Add DataConnection#isEmergency and use in trySetupData." into ics-mr0
* commit '07848843b23e10e4728fa779cc79fc38a341cf6b': Add DataConnection#isEmergency and use in trySetupData.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions