PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I27b058bd0cbbc2e253337cc56a1a032df96046de
This commit is contained in:
Jason Monk
2016-06-08 16:19:35 -04:00
parent d4e31320c1 7f7092c705
commit aaaa236cec
25 changed files with 293 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/Settings.java
View File

@@ -141,6 +141,16 @@ public class Settings extends SettingsActivity {
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 */ }