Merge commit 'eba1274978911ea188eead128645299669d02f60' into gingerbread-plus-aosp * commit 'eba1274978911ea188eead128645299669d02f60': Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE
Merge commit 'eba1274978911ea188eead128645299669d02f60' into gingerbread-plus-aosp * commit 'eba1274978911ea188eead128645299669d02f60': Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGE