tree 2eaa6df85571c958d135de3144aa3f0f8af15599
parent 55beec78a47a32288a01dde7fbc08406aa44345a
parent dd6b47e675a9601280ee1375fccee7c1ec01d9eb
author The Android Open Source Project <initial-contribution@android.com> 1369434614 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369434614 -0700

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