am c5694ebd: Merge "do not merge - Fix issue 3371096." into gingerbread

* commit 'c5694ebda9a50be391ef9cfaa7f93e9efb04b6c5':
  do not merge - Fix issue 3371096.
tree: 5e59c875c4bebd9c55eee1e7c6be6bc153926dca
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/