am ae6bdc23: Merge "Fix issue 2952766." into gingerbread

Merge commit 'ae6bdc23bd3fc74416985b93c995c54ea588d349' into gingerbread-plus-aosp

* commit 'ae6bdc23bd3fc74416985b93c995c54ea588d349':
  Fix issue 2952766.
tree: c6fb5e7d1363af5db3f3df713bf94f9e4944c176
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/