am 22a5ddb6: am 6f6b31da: Merge "Camera3: Fix the deadlock during recording...
am 22a5ddb6: am 6f6b31da: Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev
* commit '22a5ddb6':
Camera3: Fix the deadlock during recording pinch zooming