diff options
| author | John Wang <johnwang@google.com> | 2011-06-09 11:25:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-09 11:25:50 -0700 |
| commit | 01e9086e30e045d58233c2bfc4504301fb3c0384 (patch) | |
| tree | 713706e3b687bb494c536ef68d1314634302de9f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d1e0bf27b7d9ded30f31a573c5f79f9e2d46b2e1 (diff) | |
| parent | f0bb18115c163c495da44ef27774121ab3a50e71 (diff) | |
am 229d3a0c: am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE
* commit '229d3a0cbce70db82003705abf6844deec136d20':
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