| commit | 574ca4f4f15a42d6159150149f68bf3cb800d869 | [log] [tgz] |
|---|---|---|
| author | Zhijun He <zhijunhe@google.com> | Fri Jun 07 09:59:47 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 07 09:59:47 2013 -0700 |
| tree | 777d5acd68cfa82a0f55ebbd7844f0897e545b1a | |
| parent | d3a5b48a1bc4f5d6ff4472f54f909abaadd5fa39 [diff] | |
| parent | ba696bbff88d5627beaa0be95be78ba30138983d [diff] |
am ba696bbf: Merge "camera2/3: Fix deadlock take picture while preview callback" into jb-mr2-dev * commit 'ba696bbff88d5627beaa0be95be78ba30138983d': camera2/3: Fix deadlock take picture while preview callback