tree e70db2d1f610102cc46fe0b49ea988b05bbbc849
parent a74dc372acf67cc70998aa6a3cebaf413522b6e3
parent 479eec6bbd81f383db7dca642dfa10b55d64a092
author Shuzhen Wang <shuzhenwang@google.com> 1522282514 +0000
committer android-build-merger <android-build-merger@google.com> 1522282514 +0000

Merge "Camera: Add MONOCHROME capability" into pi-dev am: 782f001780
am: 479eec6bbd

Change-Id: Ic3c6f746bb7e3d0802b71cc49bb6d661b1259d61