am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2

* commit '5a6c3d491ccac07ef3f6a624a8a3e0c36959b661':
  DO NOT MERGE For bug 4422428 Squashed commit of the following:
tree: 3000167edbb74c85a25367e6b4916e17d40b67a0
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/