am 9ba1ed6a: (-s ours) am ccb91596: Merge "Adding getSupportedPictureSizes to...
am 9ba1ed6a: (-s ours) am ccb91596: Merge "Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE" into gingerbread
Merge commit '9ba1ed6a'
* commit '9ba1ed6a':
Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGE