tree b35f432afb7565cec836628b8159f3b8cf0bfe10
parent 192f85d20cfd62dea04debf612e0fd9f60240deb
parent edcd8f90cd5513b4992dc12955bca3163b763c6d
author Chien-Yu Chen <cychen@google.com> 1458585408 +0000
committer android-build-merger <android-build-merger@google.com> 1458585408 +0000

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

* commit 'edcd8f90cd5513b4992dc12955bca3163b763c6d':
  Camera3Device: Validate template ID