OSDN Git Service

Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am: eed6653f2a...
authorYahan Zhou <yahan@google.com>
Fri, 23 Jun 2017 18:09:56 +0000 (18:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 18:09:56 +0000 (18:09 +0000)
am: b4f9d09da8

Change-Id: I747db72205b2c01b3a328d752b02e3cb272bfc15


Trivial merge