| commit | 1cc3f85de70e813998102bf572caad3691a6b6a2 | [log] [tgz] |
|---|---|---|
| author | Eino-Ville Talvala <etalvala@google.com> | Tue Mar 25 18:25:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 18:25:13 2014 +0000 |
| tree | 58d2dce7ce40bd51e3091b059c17b81eb9defc5d | |
| parent | 7b1524d4e866b53ab0d02a59cc6ccb133bd98f77 [diff] | |
| parent | 4f53fe74051026e6635ba5bdbed4f1898cb66028 [diff] |
am 4f53fe74: Merge "CameraService: deadlock fix" * commit '4f53fe74051026e6635ba5bdbed4f1898cb66028': CameraService: deadlock fix