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

Merge commit '136d8336b6cb18067cd783185dacef34ae785519'

* commit '136d8336b6cb18067cd783185dacef34ae785519':
  This code in CameraSource really should hold the lock.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base