am 90d1d104: Merge "This code in CameraSource really should hold the lock." into gingerbread

Merge commit '90d1d104272954042d5440f248980e4348e97686' into gingerbread-plus-aosp

* commit '90d1d104272954042d5440f248980e4348e97686':
  This code in CameraSource really should hold the lock.
tree: ff4e6d511759318b7f8af71cecb712469d1805dc
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/