tree 5ba3fdde06c3b9554311a204d79beae91d5acfba
parent 3ac476c241bf5a95e6730a5cbf2769c6419acb33
parent eed6653f2a0799d0236d3e8bfc9adeea5d5eb9b4
author Yahan Zhou <yahan@google.com> 1498240765 +0000
committer android-build-merger <android-build-merger@google.com> 1498240765 +0000

Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev
am: eed6653f2a

Change-Id: I66f434944d2a00bee6c06d0883b916c5c87d1243