tree c193767dbd7e9abdf140f3ec8bc397107be72bf1
parent 59809cd9e1659e76c2524aa335332365a7d92d8a
parent 6c9547a9a58cf20a04112e0f8a61636aca763b3b
author Dave Mankoff <mankoff@google.com> 1561249888 -0700
committer android-build-merger <android-build-merger@google.com> 1561249888 -0700

Merge "DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType." into qt-dev
am: 6c9547a9a5

Change-Id: I2d4d5e094c415828ed22bf2d64889ac1f3d931f8