diff options
| author | John Wang <johnwang@google.com> | 2011-06-16 16:47:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-16 16:47:18 -0700 |
| commit | 3c446277029543a078a703fd4b769a92f59b4d63 (patch) | |
| tree | 1c2f422290bfac3762ea20bd9471416ac11350f9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 9240137679e039dd1cd8a09421dfd48e44c411cb (diff) | |
| parent | 1c251f9d9a514d2233361b88ecc657c4de9b5eca (diff) | |
Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions