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

* commit '404946fc260e5dff23c8a0db12e33ff842ab4b47':
  Fix issue 3371096.
tree: b774edcdf237529f1c1e851bbc624c495c57c510
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/