am 39999e3a: (-s ours) am c5694ebd: Merge "do not merge - Fix issue 3371096." into gingerbread

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