am 692dfafe: am 880dfe4f: Merge "Fix issue 3007862" into gingerbread

Merge commit '692dfafe02d04cdbab5367546e166580c92e4d2e'

* commit '692dfafe02d04cdbab5367546e166580c92e4d2e':
  Fix issue 3007862
tree: 019766b0a196126bea18f01296d519e7f32e6cb2
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/