am e23212bc: Merge "Fix issue 3142808." into gingerbread

* commit 'e23212bc89bfcb3afbf8fdb5504556ead890e1a8':
  Fix issue 3142808.
tree: 7bbdf4677ace7017af9fc2bf590447c2a9673ccd
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/