am 6dea6f4e: am 16263d9f: Squashed commit of the following:

Merge commit '6dea6f4e71b53e421564d783c227cbe0a2469183' into gingerbread-plus-aosp

* commit '6dea6f4e71b53e421564d783c227cbe0a2469183':
  Squashed commit of the following:
tree: af12a11401e2ca3ab56b74032922ab1df8cdb835
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/