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