summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJohn Wang <johnwang@google.com>2011-07-13 10:21:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-07-13 10:21:38 -0700
commitedcceea8c328a2592fc2ff9b117290d47baae14c (patch)
tree62a3555429c3caf6d6220df764adf91a9ee9b991 /opengl/tests/gl_basic/gl_basic.cpp
parentf22259c53335ad36c526d2152f823099fd3a5015 (diff)
parenta94755393faf0de1f6b65d89bce3453082499028 (diff)
am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE
* commit '2ac78a2da52b29f6ac72294072d7ca87d991dab1': Add getImei() to Phone interface.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions