diff options
| author | John Wang <johnwang@google.com> | 2011-06-16 16:50:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-16 16:50:05 -0700 |
| commit | 0fcbbddfcfe44e4ed132f7fd41186f4789de3aa0 (patch) | |
| tree | 1c2f422290bfac3762ea20bd9471416ac11350f9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2f5e3d387163425caeb37c9669b2eafe4d0f7532 (diff) | |
| parent | 3c446277029543a078a703fd4b769a92f59b4d63 (diff) | |
am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
* commit 'c826f92e6f90f4157afd4ed69c6907ff768a0d6b':
Revert "Do not merge. Return null id for Non-phone device."
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions