Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev

am: cb9a7075f8  -s ours

Change-Id: Id75c03768308873b6b2666eaae6d1c86f23d1663
This commit is contained in:
Christine Franks
2017-07-22 00:31:39 +00:00
committed by android-build-merger

Diff Content Not Available