| commit | 9f58d24b9ab509733368bdf7f0a446855706092e | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Thu Jun 10 10:18:52 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 10 10:18:52 2010 -0700 |
| tree | 9e9d488c27a946fb3b41f36348fba933fa2e0ce6 | |
| parent | 52ac6ea00252a153cb3aad9db1e3eaa559c3555a [diff] | |
| parent | decc91d5bc6e02acd52ca5bb6f87627285bb97c4 [diff] |
am 3aede37f: am 3a0b37a0: Merge "Remove the lock/unlock workaround from CameraService" into kraken