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

am: c350386476  -s ours

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

Diff Content Not Available