OSDN Git Service

Merge "camera: Update for enableZsl values in template" into oc-dev
authorChien-Yu Chen <cychen@google.com>
Mon, 24 Apr 2017 22:40:41 +0000 (22:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 24 Apr 2017 22:40:41 +0000 (22:40 +0000)
commit3d6e1045630d525b4f58819028f11dbaa5a93740
tree759305b6bbc2e9c64fe1399e22e9f6ce2961e550
parent1bde064c55aa0f58f5f4be5a5427a9127d1d7dcd
parent6bbcd2a35d3018aeccbda4bdb4adb16efe9f5889
Merge "camera: Update for enableZsl values in template" into oc-dev
am: 6bbcd2a35d

Change-Id: I35a5dea7747bdc2ed554b1c8e71624f2134eb3f9