diff options
| author | John Wang <johnwang@google.com> | 2011-06-08 14:04:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-08 14:04:37 -0700 |
| commit | d8c83052bc2fb579fc53fbbc5f4b11b5f0a9a721 (patch) | |
| tree | aa30a4379194cdb17d0ba95405b471499b23bcb2 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6255c3aa91c50f7f84e0c5f5b36f28952e991d58 (diff) | |
| parent | 4a7ccb16b96b154f31d96e990f47e88a08edc8a0 (diff) | |
am fe682fd7: am cea03df2: Do not merge. Return null id for Non-phone device.
* commit 'fe682fd74d96f5a72259aed6dd27c02c8fc7caf7':
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