tree bc1de52ecfe02e9ead371433348af2c760b0087a
parent 9f9d1efd436dd6fe4bb1a34e7cecc9292bd43697
parent 557f7dc7c73f187e1ba4b2bee605b8c368cc4a64
author Igor Murashkin <iam@google.com> 1349370160 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349370160 -0700

am d6e8c5b1: am f66cc52c: Merge "Camera2: Fix deadlock while zooming during record" into jb-mr1-dev

* commit 'd6e8c5b187225c55a279bc40f262fe137f2ef508':
  Camera2: Fix deadlock while zooming during record