am 136d8336: am 90d1d104: Merge "This code in CameraSource really should hold...
am 136d8336: am 90d1d104: Merge "This code in CameraSource really should hold the lock." into gingerbread
Merge commit '136d8336'
* commit '136d8336':
This code in CameraSource really should hold the lock.