tree 9e270807e4baec0ad4129964c6e13e01ce5a69e3
parent d6abaf326ba4e0ff342cf28a828b75a334beba69
parent 89821204379816f6bee6902c4f132c014700c3b0
author Wu-cheng Li <wuchengli@google.com> 1288022966 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288022966 -0700

am 89821204: Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread

Merge commit '89821204379816f6bee6902c4f132c014700c3b0' into gingerbread-plus-aosp

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