| commit | 883bb1be8098940494468f536bb4121ca1f110ef | [log] [tgz] |
|---|---|---|
| author | Yahan Zhou <yahan@google.com> | Fri Jun 23 18:04:56 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 23 18:04:56 2017 +0000 |
| tree | 49443eae3a0737ceda6637c89e20cb802392f56d | |
| parent | 5e2d6e2959553b347a4b69a9b7189baf1f491e64 [diff] | |
| parent | 2ff1f7e687c9ccc6ef1d423168369cb721569e5d [diff] |
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am: eed6653f2a am: 2ff1f7e687 Change-Id: I0cf1590eadb4965c03474ded10898a40af344755