OSDN Git Service

am ccb91596: Merge "Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE...
authorWu-cheng Li <wuchengli@google.com>
Thu, 19 Aug 2010 18:10:40 +0000 (11:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Aug 2010 18:10:40 +0000 (11:10 -0700)
commite4ef29f1ca222c7712bef9299817a33aa63cb0f1
tree13bbdc0fb984a32a1084a68e919e4fbb36063ce7
parentb74f413e1acdd2eb7d9c458a063c1c0c0347899b
parent427da2fd1cbfedb32f9360fdf5044ef7135affbf
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