Matthew Fritze 8cd0562bd6 Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev am: 4bd0f411ce ...

am: af054e63e0

Change-Id: I35667061a61fd66e8ab8acafccffb53f00f15149

2017-05-17 19:06:59 +00:00

..

FactoryResetPreferenceController.java

Move reset options to one place

2017-03-24 17:26:33 -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