Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8 -s ours am: 18cd618368

am: e147a19773

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

Diff Content Not Available