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

Merge commit 'a6dc4699222a484222d1c54d5319f302a02e406b' into gingerbread-plus-aosp

* commit 'a6dc4699222a484222d1c54d5319f302a02e406b':
  Fix issue 2913071.
tree: 84f37fc01e2a5d25290bf298ab183166513816ed
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/