am 0ef57993: Merge "Fix issue 2988031." into gingerbread

* commit '0ef579939e6c96fcd2b42b164c5debf535a6a53b':
  Fix issue 2988031.
tree: 96e4df21896c0eb7d6bbd74fc4741fb2867c1331
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/