| commit | 749406bfc39aa97a8ef07561d8cd93387716cd69 | [log] [tgz] |
|---|---|---|
| author | Wu-cheng Li <wuchengli@google.com> | Sat Aug 21 09:42:08 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 21 09:42:08 2010 -0700 |
| tree | 07e69da39fdc565ffaf3f31fa5db6effdf1cca8e | |
| parent | fc5d0cf56401a56f58b12412617e4b84bea2771b [diff] | |
| parent | 9ba1ed6a8fe9a79d147d50abb03f5e22d27766b9 [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