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

Merge commit 'b877a54a27d5f8a4ccbde9ae548f8c416e4317e5'

* commit 'b877a54a27d5f8a4ccbde9ae548f8c416e4317e5':
  Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge