am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1

* commit '92f2f3ff2ea5c5b474722f2055cfee4916010e26':
  Bug 3012968 DRM output control
tree: c54ef9ad6a5166f7a8b3c42a134370b874f12c07
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/