From: Chien-Yu Chen <cychen@google.com>
Date: Mon, 17 Apr 2017 21:50:01 +0000 (+0000)
Subject: Merge "Camera: Override enableZsl based on SDK version" into oc-dev am: 3b41407f19
X-Git-Tag: android-x86-8.1-r1~993
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=753bb4ce8464c1bc3b6db8f8aa392ae1f11c7b48;p=android-x86%2Fframeworks-base.git

Merge "Camera: Override enableZsl based on SDK version" into oc-dev am: 3b41407f19
am: e92d62ac89

Change-Id: Ia748c7848e6feedd87294475093837b43c3cc55e
---

753bb4ce8464c1bc3b6db8f8aa392ae1f11c7b48