am b877a54a: (-s ours) am 89821204: Merge "Remove the FLIP_H/ROT_90 workaround...
am b877a54a: (-s ours) am 89821204: Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread
Merge commit 'b877a54a'
* commit 'b877a54a':
Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge