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

am: 44ce9aefbf

Change-Id: I7a1b3604bc05718249c532f142c9de45f0c515f7

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(),
     };