am 574ca4f4: am ba696bbf: Merge "camera2/3: Fix deadlock take picture while...
am 574ca4f4: am ba696bbf: Merge "camera2/3: Fix deadlock take picture while preview callback" into jb-mr2-dev
* commit '574ca4f4':
camera2/3: Fix deadlock take picture while preview callback