summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2010-08-24 10:16:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-24 10:16:42 -0700
commit5ff0512a0ebef56919f81011aaf854a545d42824 (patch)
tree9535013ef46bc8c2bb119e23ead0c28f5b894a94 /opengl/tests/gl_basic/gl_basic.cpp
parentb11bdfbf13cbdbfd77a636d767455f87b7e4bff6 (diff)
parentd3f1b287248e929511550e273895ba282a80ded8 (diff)
am d9034879: am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.
Merge commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2' * commit 'd90348796829f3d3a443e73ea3b3f2f9e79071c2': Change CDMAPhone.getDeviceId to return MEID or ESN.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions