| commit | 83e5c374ec29859e64347820b38013ecc3aaf935 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 19 16:02:29 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 19 16:02:29 2013 -0700 |
| tree | aa6f6324945e19f20918b90bf60768e08239174a | |
| parent | e4bc8dbf0329c4845c692a02e54c16906998f77d [diff] | |
| parent | f2d744d9535ca59be6cd878830176f81a0a8fbc6 [diff] |
am f2d744d9: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'f2d744d9535ca59be6cd878830176f81a0a8fbc6': Camera2/3: Fix deadlock when starting recording before preview.