am 4dcaeb6d: am 404946fc: Merge "Fix issue 3371096." into honeycomb

* commit '4dcaeb6d776bc87469a97001a223099c8e805579':
  Fix issue 3371096.
tree: 8dfd5fc7a1c768c32bbc9991859be2f8ad1752f7
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/