summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2011-02-01 21:06:38 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-01 21:06:38 -0800
commit239798322da0f32795fccdbfb804a412204fef4d (patch)
treeae32e366e7eea386e2213a28ed10d5e6bad0b31c /opengl/tests/gl_basic/gl_basic.cpp
parent3ffd2c322d9471a13bb796c5e0b752c96aea22be (diff)
parent223f2134bd9fe7f1f3ad142a6728e51e6fb853e5 (diff)
am ff34565f: am 1bf518d8: Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb
* commit 'ff34565fcb366d4bd0066bd7fe6f588e42a9a9cc': Add TelephonyManager.getCurrentPhoneType
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions