OSDN Git Service

Merge "Camera: Override enableZsl based on SDK version" into oc-dev am: 3b41407f19
authorChien-Yu Chen <cychen@google.com>
Mon, 17 Apr 2017 21:50:01 +0000 (21:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 17 Apr 2017 21:50:01 +0000 (21:50 +0000)
am: e92d62ac89

Change-Id: Ia748c7848e6feedd87294475093837b43c3cc55e


Trivial merge