tree 08b54b7a5da6be4afd90c5831d530e77429e5f9f
parent 2411a58e93b32926dd96f07c724564f14507df2b
parent 117407c4e3cea37f6a9cfd8fcce4200adf69a7ba
author Chien-Yu Chen <cychen@google.com> 1494283614 +0000
committer android-build-merger <android-build-merger@google.com> 1494283614 +0000

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

Change-Id: Icb1a7dca02367d979d33af904b446ffccc5766d8