tree 4fb36e836895f3f42b3608a7050da63cd65ed96f
parent 4bfc4a67d4f7d5a9b6cbe5a39d4b599e8ceb505b
parent bc77d3a1e0c19c1221c547d7e39311d74591c2d7
author The Android Open Source Project <initial-contribution@android.com> 1349450439 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349450439 -0700

am 6c9282d3: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '6c9282d3bb5082266cfd9042f62ceea131e5b849':
  Camera2: Fix deadlock while zooming during record