am 46beb433: (-s ours) am 0c636055: Merge "Mirror the preview for front-facing...
am 46beb433: (-s ours) am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread
Merge commit '46beb433'
* commit '46beb433':
Mirror the preview for front-facing cameras. do not merge