am 0b9a12bf: Merge "Fix issue 2929440" into gingerbread

Merge commit '0b9a12bf8101830fa9bde4015d0043df14cab6db' into gingerbread-plus-aosp

* commit '0b9a12bf8101830fa9bde4015d0043df14cab6db':
  Fix issue 2929440
tree: 5329548f54423849ad5938f3ec487e8d63641530
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/