| commit | 6b63dce8c9f8ba2d165ed249c873e537516c6b19 | [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 | ec36197b6a95f0c9021d0af4a7e9a302e45129e5 | |
| parent | 5320b326a48a473f58d0e99a81d75f277254b958 [diff] | |
| parent | 136d8336b6cb18067cd783185dacef34ae785519 [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.