diff options
| author | John Wang <johnwang@google.com> | 2011-06-07 15:56:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-07 15:56:19 -0700 |
| commit | f0bb18115c163c495da44ef27774121ab3a50e71 (patch) | |
| tree | aa30a4379194cdb17d0ba95405b471499b23bcb2 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 08debb343e7588a18d0d779bbe051ad9b8cf1df6 (diff) | |
| parent | b7dfeedb56eee69b5dd9c93d58b207077b943982 (diff) | |
am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE
* commit 'fc94d45fc209dbcfdf7f57e0c04c581e1e51988b':
Make getDeviceId return null for Non-phone device.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions