am 6694c71d: (-s ours) am eba12749: Merge "Adding getSupportedPreviewSizes to...
am 6694c71d: (-s ours) am eba12749: Merge "Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE" into gingerbread
Merge commit '6694c71d'
* commit '6694c71d':
Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE