tree f2108c324c3673e69a1b05343d73dce82c48110f
parent dd3e6bd26749b5656af8053406961e912a18eb0e
parent bbdae2f58c3bd18d72be876c023b4bfb00e2f920
author Chien-Yu Chen <cychen@google.com> 1494282844 +0000
committer android-build-merger <android-build-merger@google.com> 1494282844 +0000

Merge "camera: Clarify ZSL supports" into oc-dev
am: bbdae2f58c

Change-Id: Ie8aaa188fa1e9037e8ed8130ca1a57a8558bf659