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