diff options
| author | James Dong <jdong@google.com> | 2011-03-16 15:12:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-16 15:12:58 -0700 |
| commit | 63e29217a5785dec85b08b6aa5343b414deba3c0 (patch) | |
| tree | 0768d0e9d2ad8983469a9759df7ca3890ff09cdc /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f391369214a7447feaf534de71f297f6b5f2285a (diff) | |
| parent | ab375862e906329f7685b332711360fabf9c64ea (diff) | |
am 28fc2037: am fc591762: Merge "Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file." into honeycomb-mr1
* commit '28fc2037bffd1593b56fe1e1522de544a7d49120':
Add the default camera id to mCameraIds for emulator and those devices without media_profiles.xml configuration file.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions