| commit | a61c24c0919c4984345454d95fb3d02723a5613d | [log] [tgz] |
|---|---|---|
| author | Yahan Zhou <yahan@google.com> | Fri Jun 23 17:59:26 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 23 17:59:26 2017 +0000 |
| tree | 7837bdac750a70266b75000aa9c4802693a8269d | |
| parent | 990b0768336caaa7ce69646ceeb7db7a13528af3 [diff] | |
| parent | eed6653f2a0799d0236d3e8bfc9adeea5d5eb9b4 [diff] |
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am: eed6653f2a Change-Id: Ia962664983096059da8ecbffa7f13ef525e4a6e4