OSDN Git Service

am 6f6b31da: Merge "Camera3: Fix the deadlock during recording pinch zooming" into...
authorZhijun He <zhijunhe@google.com>
Fri, 24 May 2013 15:34:46 +0000 (08:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 May 2013 15:34:46 +0000 (08:34 -0700)
commit22a5ddb68173b75053d838a30d091920cd0a1dca
tree779d2d32ae4371ef43ce3abc87097ca6fa75cec0
parent14e585c8e0667c13202dbefc52f9d00ffe161cf1
parent6f6b31da6097f1d770137ebadac5023dd8b79413
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