am 880dfe4f: Merge "Fix issue 3007862" into gingerbread

Merge commit '880dfe4f675128188f8d598f2025a417ccabd1bf' into gingerbread-plus-aosp

* commit '880dfe4f675128188f8d598f2025a417ccabd1bf':
  Fix issue 3007862
tree: e7f4104514ddf3c0be71cecc52b74022a98e1b4f
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/