| commit | 2212b0198cf582dafe002374d80f470cf92a40b8 | [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 | 2e646d9254c46d5a74bfbbccfafb933d8740cc71 | |
| parent | adae074200416bd58cc7b114eaa888646bdcf046 [diff] | |
| parent | a97323a1fbab2e94f0c4a51c092a37bc1668dfd4 [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.