OSDN Git Service

resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e
authorEino-Ville Talvala <etalvala@google.com>
Fri, 15 Jan 2016 00:19:54 +0000 (00:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jan 2016 00:19:54 +0000 (00:19 +0000)
commit295a488e49007fc0493135d5003ec206ecf308b2
tree188a77d28de12b635c24b3f978fc16885dc6aca9
parente2e46f5fa1e669fb7f00b3ed2bbc37390e0a5a68
parent0fefc974ff78acd66429b750b7131b0425b1ede3
resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e
am: 0fefc974ff

* commit '0fefc974ff78acd66429b750b7131b0425b1ede3':
  Camera: Disallow dumping clients directly
services/camera/libcameraservice/CameraService.cpp
services/camera/libcameraservice/api1/Camera2Client.cpp
services/camera/libcameraservice/api2/CameraDeviceClient.cpp
services/camera/libcameraservice/api2/CameraDeviceClient.h