| commit | 136d8336b6cb18067cd783185dacef34ae785519 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Wed Aug 11 13:28:51 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 11 13:28:51 2010 -0700 |
| tree | 4f9f87f40f33e84e68ccc71aebebe3e9dbcd8cd5 | |
| parent | 79cb9a5d2d455af22c56b8cee045962c61668422 [diff] | |
| parent | 90d1d104272954042d5440f248980e4348e97686 [diff] |
am 90d1d104: Merge "This code in CameraSource really should hold the lock." into gingerbread Merge commit '90d1d104272954042d5440f248980e4348e97686' into gingerbread-plus-aosp * commit '90d1d104272954042d5440f248980e4348e97686': This code in CameraSource really should hold the lock.