| commit | eab1f45be78ab2f197a7aa57f1de6a670ae63352 | [log] [tgz] |
|---|---|---|
| author | Wu-cheng Li <wuchengli@google.com> | Sat Aug 21 09:42:20 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 21 09:42:20 2010 -0700 |
| tree | cf9897edde49cd54cfae3ee713b9b260a432dd58 | |
| parent | 204d48d350da28131d3c87a5679983b29ddbb8d3 [diff] | |
| parent | 331e75cf1aa54f396a4ad7ca199b7f0c6efba102 [diff] |
am 6694c71d: (-s ours) am eba12749: Merge "Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE" into gingerbread Merge commit '6694c71dd8507370262998ec1da8ff5e0ffcdf49' * commit '6694c71dd8507370262998ec1da8ff5e0ffcdf49': Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE