diff options
| author | Wink Saville <wink@google.com> | 2010-08-20 16:37:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-20 16:37:21 -0700 |
| commit | d3f1b287248e929511550e273895ba282a80ded8 (patch) | |
| tree | 85f48fd8e5576feecb15939f81e6af4bbe1942fc /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a10ea3b34e6101cac16c150a2585ac978eb72b3e (diff) | |
| parent | f6ad16c48e5ce5ac5db1f9df19f719e0a5572bd2 (diff) | |
am b2cc86da: am 3158cf68: Change CDMAPhone.getDeviceId to return MEID or ESN.
Merge commit 'b2cc86da29452769ff6210f1dfef4b51aac1d75e' into gingerbread-plus-aosp
* commit 'b2cc86da29452769ff6210f1dfef4b51aac1d75e':
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