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

Browse Source

Merge commit '136d8336b6cb18067cd783185dacef34ae785519'

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

...

This commit is contained in:

Andreas Huber 2010-08-11 13:32:36 -07:00 committed by Android Git Automerger

parent adae074200 a97323a1fb

commit 2212b0198c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available