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:26 +0000 (17:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 17:59:26 +0000 (17:59 +0000)
commita61c24c0919c4984345454d95fb3d02723a5613d
tree7837bdac750a70266b75000aa9c4802693a8269d
parent990b0768336caaa7ce69646ceeb7db7a13528af3
parenteed6653f2a0799d0236d3e8bfc9adeea5d5eb9b4
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev
am: eed6653f2a

Change-Id: Ia962664983096059da8ecbffa7f13ef525e4a6e4