am f3847e87: Merge "DO NOT MERGE" into gingerbread

* commit 'f3847e875eb1c58094a2d159a2a6f3f0b381d77a':
  DO NOT MERGE
tree: 5bda6ee67deb1d40786012aa4540ce6037724d15
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/