OSDN Git Service

Merge "Camera3Device: Validate template ID" into klp-dev am: ac5ef62
authorChien-Yu Chen <cychen@google.com>
Mon, 21 Mar 2016 18:29:38 +0000 (18:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 Mar 2016 18:29:38 +0000 (18:29 +0000)
commitd6e32200aa134c0fc058bc830ccce7eb4c830026
treee1fc635ca3b0f0baa094c1bcddcbbb96966a538b
parent726338dfde794469362f6d62139dee3cf062f030
parente57ada1277564469704810aa0ceb353787475c68
Merge "Camera3Device: Validate template ID" into klp-dev am: ac5ef62
am: e57ada1

* commit 'e57ada1277564469704810aa0ceb353787475c68':
  Camera3Device: Validate template ID
services/camera/libcameraservice/device3/Camera3Device.cpp