| commit | 22a5ddb68173b75053d838a30d091920cd0a1dca | [log] [tgz] |
|---|---|---|
| author | Zhijun He <zhijunhe@google.com> | Fri May 24 08:34:46 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 24 08:34:46 2013 -0700 |
| tree | 779d2d32ae4371ef43ce3abc87097ca6fa75cec0 | |
| parent | 14e585c8e0667c13202dbefc52f9d00ffe161cf1 [diff] | |
| parent | 6f6b31da6097f1d770137ebadac5023dd8b79413 [diff] |
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