From: Chien-Yu Chen <cychen@google.com>
Date: Mon, 21 Mar 2016 18:29:38 +0000 (+0000)
Subject: Merge "Camera3Device: Validate template ID" into klp-dev am: ac5ef62
X-Git-Tag: android-x86-7.1-r1~217^2~2^2^2^2^2~5^2~12^2^2~23
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d6e32200aa134c0fc058bc830ccce7eb4c830026;p=android-x86%2Fframeworks-av.git

Merge "Camera3Device: Validate template ID" into klp-dev am: ac5ef62
am: e57ada1

* commit 'e57ada1277564469704810aa0ceb353787475c68':
  Camera3Device: Validate template ID
---

d6e32200aa134c0fc058bc830ccce7eb4c830026