resolve merge conflicts of 7f7092c to nyc-mr1-dev

Change-Id: I27b058bd0cbbc2e253337cc56a1a032df96046de

diff --cc AndroidManifest.xml
Simple merge

diff --cc res/values/strings.xml
Simple merge

diff --cc res/xml/device_info_settings.xml
Simple merge

diff --cc src/com/android/settings/Settings.java
index 1eb3af4,3c589cc..1bf1e0e
--- 1/src/com/android/settings/Settings.java
--- 2/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@@ -139,8 -139,17 +139,18 @@@ public class Settings extends SettingsA
      public static class ScreenLockSuggestionActivity extends ChooseLockGeneric { /* empty */ }
      public static class WallpaperSettingsActivity extends SettingsActivity { /* empty */ }
      public static class ManagedProfileSettingsActivity extends SettingsActivity { /* empty */ }
 +    public static class DeletionHelperActivity extends SettingsActivity { /* empty */ }
  
+     public static class ApnEditorActivity extends SettingsActivity { /* empty */ }
+     public static class ChooseAccountActivity extends SettingsActivity { /* empty */ }
+     public static class IccLockSettingsActivity extends SettingsActivity { /* empty */ }
+     public static class ImeiInformationActivity extends SettingsActivity { /* empty */ }
+     public static class SimStatusActivity extends SettingsActivity { /* empty */ }
+     public static class StatusActivity extends SettingsActivity { /* empty */ }
+     public static class TestingSettingsActivity extends SettingsActivity { /* empty */ }
+     public static class WifiAPITestActivity extends SettingsActivity { /* empty */ }
+     public static class WifiInfoActivity extends SettingsActivity { /* empty */ }
+ 
      // Categories.
      public static class WirelessSettings extends SettingsActivity { /* empty */ }
      public static class DeviceSettings extends SettingsActivity { /* empty */ }

diff --cc src/com/android/settings/SettingsActivity.java
index 9a65d3c,c597d16..330c9ea
--- 1/src/com/android/settings/SettingsActivity.java
--- 2/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@@ -70,10 -70,10 +71,11 @@@ import com.android.settings.application
  import com.android.settings.applications.WriteSettingsDetails;
  import com.android.settings.applications.VrListenerSettings;
  import com.android.settings.bluetooth.BluetoothSettings;
 -import com.android.settings.dashboard.DashboardSummary;
 +import com.android.settings.dashboard.DashboardContainerFragment;
  import com.android.settings.dashboard.SearchResultsSummary;
  import com.android.settings.datausage.DataUsageSummary;
 +import com.android.settings.deletionhelper.DeletionHelperFragment;
+ import com.android.settings.deviceinfo.ImeiInformation;
  import com.android.settings.deviceinfo.PrivateVolumeForget;
  import com.android.settings.deviceinfo.PrivateVolumeSettings;
  import com.android.settings.deviceinfo.PublicVolumeSettings;
@@@ -333,7 -337,14 +340,15 @@@ public class SettingsActivity extends S
              WallpaperTypeSettings.class.getName(),
              VrListenerSettings.class.getName(),
              ManagedProfileSettings.class.getName(),
 +            DeletionHelperFragment.class.getName(),
+             ChooseAccountActivity.class.getName(),
+             IccLockSettings.class.getName(),
+             ImeiInformation.class.getName(),
+             SimStatus.class.getName(),
+             Status.class.getName(),
+             TestingSettings.class.getName(),
+             WifiAPITest.class.getName(),
+             WifiInfo.class.getName(),
      };