diff options
| author | John Wang <johnwang@google.com> | 2011-06-08 13:52:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-08 13:52:26 -0700 |
| commit | 4a7ccb16b96b154f31d96e990f47e88a08edc8a0 (patch) | |
| tree | cc7d5eaaff5d3dbb0b1dd3a45ce6aeb2fb6e5b1e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4e330146a3d15bdf0166880ca982894bbc8eabb3 (diff) | |
| parent | 1c251f9d9a514d2233361b88ecc657c4de9b5eca (diff) | |
am cea03df2: Do not merge. Return null id for Non-phone device.
* commit 'cea03df201dc6659654234bc5fbfebf1b6a06e42':
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