| commit | f3e969a3bb507258a844434af59a60a929426726 | [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 | 26db7995a6b7c5fe61866d25298cdbcf95199849 | |
| parent | c8105742ffcc2cd104506f05e99f69f7841ecb58 [diff] | |
| parent | 3aede37f1902bd2d364111da11674a642afd318f [diff] |
am 3aede37f: am 3a0b37a0: Merge "Remove the lock/unlock workaround from CameraService" into kraken