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)
am: eed6653f2a

Change-Id: I66f434944d2a00bee6c06d0883b916c5c87d1243


Trivial merge