diff options
| author | John Wang <johnwang@google.com> | 2011-06-09 11:56:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-09 11:56:28 -0700 |
| commit | eb68e8bf0772b84ecd8827e4ae2e6420853c25b3 (patch) | |
| tree | 713706e3b687bb494c536ef68d1314634302de9f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4d42d9dc3552aa545c7059adbcab34dbd7b03a6c (diff) | |
| parent | d8c83052bc2fb579fc53fbbc5f4b11b5f0a9a721 (diff) | |
am 1861225b: (-s ours) am fe682fd7: am cea03df2: Do not merge. Return null id for Non-phone device.
* commit '1861225be3c848fdf395f7aa815c673af4239011':
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