| commit | 355daed5e7c29fcf5514ed8e8319ce60128e30b0 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri May 24 15:30:14 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 24 15:30:14 2013 -0700 |
| tree | 2eaa6df85571c958d135de3144aa3f0f8af15599 | |
| parent | 55beec78a47a32288a01dde7fbc08406aa44345a [diff] | |
| parent | dd6b47e675a9601280ee1375fccee7c1ec01d9eb [diff] |
am dd6b47e6: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'dd6b47e675a9601280ee1375fccee7c1ec01d9eb': Camera3: Fix the deadlock during recording pinch zooming camera3: Disable ZSL for limited mode camera HALs camera3: Fix zsl buffers released-while-in-use race condition