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:
cb9a7075f8
am: c350386476
-s ours
Change-Id: I6371e6575ba1b60dfe1c715c46e17be4f6340d98