OSDN Git Service

Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev
authorYahan Zhou <yahan@google.com>
Fri, 23 Jun 2017 17:59:25 +0000 (17:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 17:59:25 +0000 (17:59 +0000)
commit2ff1f7e687c9ccc6ef1d423168369cb721569e5d
tree5ba3fdde06c3b9554311a204d79beae91d5acfba
parent3ac476c241bf5a95e6730a5cbf2769c6419acb33
parenteed6653f2a0799d0236d3e8bfc9adeea5d5eb9b4
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev
am: eed6653f2a

Change-Id: I66f434944d2a00bee6c06d0883b916c5c87d1243