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