tree 33027ab4e99171384e39cb54bd0aee89407247fe
parent 985664102bd76303f138a7691a7c2d0bab9eee17
parent 7d9f02e603619dfb1eb863d64fc1f662063b31cc
author ruiduoy <ruiduoy@google.com> 1505524632 +0000
committer android-build-merger <android-build-merger@google.com> 1505524632 +0000

Merge "Camera: The ensemble detector. - Default persist.camera.gcam.fd.ensemble to 1." into oc-mr1-dev am: 184b48438c
am: 7d9f02e603

Change-Id: If3ad9c457ea43b7326ceb4909acfa9d819d9bc28