tree 439fb2a8af1defe105de3dacb718c58ddbc74e70
parent 9acb8a2030444c46f9c4fa55e1f6137058cf46f8
parent 04e410dac8a4e69cff7aaa78c2c0871ce0b027ca
author Mathias Agopian <mathias@google.com> 1287703562 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287703562 -0700

am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread

Merge commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4' into gingerbread-plus-aosp

* commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4':
  Mirror the preview for front-facing cameras. do not merge