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:04:55 +0000 (18:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 18:04:55 +0000 (18:04 +0000)
commitb4f9d09da85ef73f934110081b7b902250c2b39f
tree49443eae3a0737ceda6637c89e20cb802392f56d
parent5e2d6e2959553b347a4b69a9b7189baf1f491e64
parenta61c24c0919c4984345454d95fb3d02723a5613d
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am: eed6653f2a
am: a61c24c091

Change-Id: I3144fd4dd59d909fb503b2accce70719f6c150b2