| commit | f05aec20748c9b71ffbb35cf0ae10078d297b45d | [log] [tgz] |
|---|---|---|
| author | Zhijun He <zhijunhe@google.com> | Fri Jun 07 10:01:13 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 07 10:01:13 2013 -0700 |
| tree | 7834ba41ef91922a0729ff52771a79f2a92bd2f8 | |
| parent | 04b035e3ccbf2919e4447c66e6483c11f2889f01 [diff] | |
| parent | 574ca4f4f15a42d6159150149f68bf3cb800d869 [diff] |
am 574ca4f4: am ba696bbf: Merge "camera2/3: Fix deadlock take picture while preview callback" into jb-mr2-dev * commit '574ca4f4f15a42d6159150149f68bf3cb800d869': camera2/3: Fix deadlock take picture while preview callback