| commit | ae6c881bc5051b9422f3f8d9b80232ea56014166 | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Thu Jan 10 13:35:34 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 10 13:35:34 2013 -0800 |
| tree | abb71404bf9988ff351f713cd35b58e90e890620 | |
| parent | 6917606e04091035bc963e1b88665f6b83b9970d [diff] | |
| parent | 778dd967ade8c37b4b4fc6afdd6b5f2a2a2d6875 [diff] |
am 778dd967: Merge "Camera2: Fix a deadlock when closing the camera: DO NOT MERGE" into jb-mr1-aah-dev * commit '778dd967ade8c37b4b4fc6afdd6b5f2a2a2d6875': Camera2: Fix a deadlock when closing the camera: DO NOT MERGE