| commit | 030b888ef6a586a1f0fafe0adc4312f775878d2b | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Wed Aug 11 13:32:36 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 11 13:32:36 2010 -0700 |
| tree | a191025ad3eb2a71013eda550f4ae3e5d6f3802c | |
| parent | ad2df1d0776066dc7c2e203390c336451238684a [diff] | |
| parent | 1dc1938c477249c0c1adc59043da64386eea4c2d [diff] |
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.