tree ecc079816676630723bef3b4fcbd30fdd8622187
parent 0225a1883b85466e59ba479314ca7056f2c5de98
parent b4d8461d8d55c7be6c0bfcdeb1010a8751b56b6a
author Chien-Yu Chen <cychen@google.com> 1512272560 +0000
committer android-build-merger <android-build-merger@google.com> 1512272560 +0000

Merge "camera: Drop pending preview for enableZsl shots" into oc-mr1-dev am: 69a74297cc
am: b4d8461d8d  -s ours

Change-Id: Ie08e2449fa654fb6b55cc2eb8c293f594817a809