am 6943b94b: am a6dc4699: Merge "Fix issue 2913071." into gingerbread

Merge commit '6943b94b8f267c83060946bae0961efc30444dee'

* commit '6943b94b8f267c83060946bae0961efc30444dee':
  Fix issue 2913071.
tree: aa42a890231b7dd3ec2c21478bf19d2c276425a2
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/