tree 6fdae909fe3cd857651a294da51c98b6c97f858d
parent 677755f2e4ced986cade64653222d7f045d0044d
parent 930c98004392a56a76ce1217f1791db5965b6ea5
author Guennadi Liakhovetski <guennadi.liakhovetski@intel.com> 1516673160 +0000
committer android-build-merger <android-build-merger@google.com> 1516673160 +0000

Merge "CameraService: fix camera removal paths"
am: 930c980043

Change-Id: Ia97ce84c1b954fcfd0a15743071e968492e40221