tree c60310ed813bb93d9066eb38b4d207cfb32ed067
parent dd18889034905e805465d0187c5cf2e21fa0f723
parent 63d16055f18d03744bde025fdb77edf31b15908b
author Eino-Ville Talvala <etalvala@google.com> 1499907464 +0000
committer android-build-merger <android-build-merger@google.com> 1499907464 +0000

Merge "CameraService: Clean up ICameraServiceProxy; send it more info" into oc-dr1-dev am: 437f48e64a
am: 63d16055f1

Change-Id: Idbdbb279845ff9286e74c62115d1c6f1114ec12c