From: Yahan Zhou Date: Fri, 23 Jun 2017 18:09:56 +0000 (+0000) Subject: Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am: eed6653f2a... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=db5e858c8c960cd4b2f71a2638604a7a217d04a1;p=android-x86%2Fhardware-interfaces.git Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am: eed6653f2a am: a61c24c091 am: b4f9d09da8 Change-Id: I747db72205b2c01b3a328d752b02e3cb272bfc15 --- db5e858c8c960cd4b2f71a2638604a7a217d04a1