diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-08-19 11:10:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-19 11:10:44 -0700 |
| commit | 331e75cf1aa54f396a4ad7ca199b7f0c6efba102 (patch) | |
| tree | 13bbdc0fb984a32a1084a68e919e4fbb36063ce7 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e4ef29f1ca222c7712bef9299817a33aa63cb0f1 (diff) | |
| parent | 906d4c565fe1c8098df2093c79acc02f5b92814a (diff) | |
am eba12749: Merge "Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE" into gingerbread
Merge commit 'eba1274978911ea188eead128645299669d02f60' into gingerbread-plus-aosp
* commit 'eba1274978911ea188eead128645299669d02f60':
Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions