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