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

Merge commit '46beb43357e32507189203db4626d0df954abe62'

* commit '46beb43357e32507189203db4626d0df954abe62':
  Mirror the preview for front-facing cameras. do not merge
tree: ed3db875a6bb039a3d86f665660b59f9b09c5bbe
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/