tree 96920ef8677d1be3f4f0a05f08d6adb2c3189867
parent adec8518afcf2717fd3c52e2a5c1fff39811d386
parent 2976109d898ad14129281d117c07301f3567c065
author Chien-Yu Chen <cychen@google.com> 1501703815 +0000
committer android-build-merger <android-build-merger@google.com> 1501703815 +0000

Merge "camera2: Fix template requirements" into oc-dev
am: 2976109d89

Change-Id: I20b68b33caf48afeead56116602c6a9b2a33ab26