b877a54a27
Merge commit '89821204379816f6bee6902c4f132c014700c3b0' into gingerbread-plus-aosp * commit '89821204379816f6bee6902c4f132c014700c3b0': Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge