Merge \"Make MasterClear a valid entry fragment.\" into nyc-mr1-dev

am: 44ce9aefbf

Change-Id: I7a1b3604bc05718249c532f142c9de45f0c515f7

src/com/android/settings/Settings.java

@@ -77,6 +77,7 @@ public class Settings extends SettingsActivity {
     public static class UsageAccessSettingsActivity extends SettingsActivity { /* empty */ }
     public static class LocationSettingsActivity extends SettingsActivity { /* empty */ }
     public static class PrivacySettingsActivity extends SettingsActivity { /* empty */ }
+    public static class FactoryResetActivity extends SettingsActivity { /* empty */ }
     public static class RunningServicesActivity extends SettingsActivity { /* empty */ }
     public static class ManageAccountsSettingsActivity extends SettingsActivity { /* empty */ }
     public static class PowerUsageSummaryActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/SettingsActivity.java

@@ -352,6 +352,7 @@ public class SettingsActivity extends SettingsDrawerActivity
             TestingSettings.class.getName(),
             WifiAPITest.class.getName(),
             WifiInfo.class.getName(),
+            MasterClear.class.getName(),
     };