| commit | 8f94ee48e2eedb3b4c22831c8f6bb46787c65a69 | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Fri Jan 11 10:53:58 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 11 10:53:58 2013 -0800 |
| tree | 477c17ad5b3ce4d9f09fcf26fdb60c7a52f58cbc | |
| parent | 6fc43dfabc71eaef01c2a5ffbe7de39507d89cc3 [diff] | |
| parent | ae6c881bc5051b9422f3f8d9b80232ea56014166 [diff] |
am ae6c881b: (-s ours) am 778dd967: Merge "Camera2: Fix a deadlock when closing the camera: DO NOT MERGE" into jb-mr1-aah-dev * commit 'ae6c881bc5051b9422f3f8d9b80232ea56014166': Camera2: Fix a deadlock when closing the camera: DO NOT MERGE