am a3f5b615: (-s ours) am f3847e87: Merge "DO NOT MERGE" into gingerbread

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