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)
commitdb5e858c8c960cd4b2f71a2638604a7a217d04a1
treea423e9fa53e0981c342458559ca3a377d222d498
parentae3e6288d141fe344694faf430d5556fe3db5c99
parentb4f9d09da85ef73f934110081b7b902250c2b39f
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am: eed6653f2a am: a61c24c091
am: b4f9d09da8

Change-Id: I747db72205b2c01b3a328d752b02e3cb272bfc15