am 7629e8dd: Merge "Fix issue 2876124." into gingerbread

Merge commit '7629e8dd1426a8a8e38a82e13eb51d1c6af24f36' into gingerbread-plus-aosp

* commit '7629e8dd1426a8a8e38a82e13eb51d1c6af24f36':
  Fix issue 2876124.
tree: eadcbb991b13055cdee86dc3b482b8e8dce098d1
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/