tree 60664968001d8de9ae740ae4e08f8b1e9c3d6f0f
parent 2359ddb039fe38ada7aaee26f41d465574fede34
parent 01d6fb2c9cf408c0451f7ee89faf2d5244dbfa6c
author Eino-Ville Talvala <etalvala@google.com> 1500011735 +0000
committer android-build-merger <android-build-merger@google.com> 1500011735 +0000

Merge "CameraManager: Handle camera service being disabled explicitly" into oc-dr1-dev am: 0c0fd0375c
am: 01d6fb2c9c

Change-Id: I7a2399498f7f234a09545107b0fdda3cade6ee30