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

am: 18cd618368

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

Diff Content Not Available