| commit | 3aede37f1902bd2d364111da11674a642afd318f | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Thu Jun 10 10:16:55 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 10 10:16:55 2010 -0700 |
| tree | 86a8e7761bf825a89e1fba5ce4b5ddbb7004f374 | |
| parent | 7b909c055378ce350c52c299b5bf690d9c1976ce [diff] | |
| parent | 3a0b37a04e8c8cc2e1e2386023bc5ce77cd91625 [diff] |
am 3a0b37a0: Merge "Remove the lock/unlock workaround from CameraService" into kraken