Christine Franks c101dda9f7 Merge "Allow FR in carrier demo mode" into oc-dev am: 9ef166a578 ...

am: d974ccb625

Change-Id: I8d693fd2d41f73b53416ee83d7b289496765c660

2017-05-31 22:54:31 +00:00

..

FactoryResetPreferenceController.java

Allow FR in carrier demo mode

2017-05-31 12:04:01 -07:00

ResetDashboardFragment.java

Depend on SettingsLib's version of lifecycle and FooterMixin.

2017-05-12 11:10:46 -07:00

SystemDashboardFragment.java

Remove Backup and Reset duplicates from Settings search

2017-05-16 15:43:21 -07:00