| commit | ac1a3ad5e128764f23cf44a6c73ad2147361c5bd | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Jun 23 18:05:11 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 23 18:05:12 2017 +0000 |
| tree | 49443eae3a0737ceda6637c89e20cb802392f56d | |
| parent | b4f9d09da85ef73f934110081b7b902250c2b39f [diff] | |
| parent | 883bb1be8098940494468f536bb4121ca1f110ef [diff] |
Merge "Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am: eed6653f2a am: 2ff1f7e687" into oc-dr1-dev-plus-aosp