OSDN Git Service

Merge "camera: Update for enableZsl values in template" into oc-dev am: 6bbcd2a35d
authorChien-Yu Chen <cychen@google.com>
Mon, 24 Apr 2017 23:10:43 +0000 (23:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 24 Apr 2017 23:10:43 +0000 (23:10 +0000)
am: 3d6e104563

Change-Id: I93a368b6824ae6535411487f15b9f9a378f1682f


Trivial merge