diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-08-21 09:42:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-21 09:42:08 -0700 |
| commit | 204d48d350da28131d3c87a5679983b29ddbb8d3 (patch) | |
| tree | cf9897edde49cd54cfae3ee713b9b260a432dd58 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 73ad7b5040d5ba40489b40ec077a6a1dd72e89ad (diff) | |
| parent | e4ef29f1ca222c7712bef9299817a33aa63cb0f1 (diff) | |
am 9ba1ed6a: (-s ours) am ccb91596: Merge "Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE" into gingerbread
Merge commit '9ba1ed6a8fe9a79d147d50abb03f5e22d27766b9'
* commit '9ba1ed6a8fe9a79d147d50abb03f5e22d27766b9':
Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions