tree 779d2d32ae4371ef43ce3abc87097ca6fa75cec0
parent 14e585c8e0667c13202dbefc52f9d00ffe161cf1
parent 6f6b31da6097f1d770137ebadac5023dd8b79413
author Zhijun He <zhijunhe@google.com> 1369409686 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369409686 -0700

am 6f6b31da: Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev

* commit '6f6b31da6097f1d770137ebadac5023dd8b79413':
  Camera3: Fix the deadlock during recording pinch zooming