| commit | 33acb15e032ac65d743b708731004b9a5f7813d5 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon Mar 16 12:48:05 2015 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Mon Mar 16 12:48:05 2015 +0000 |
| tree | 7ac0f6a7a99944246242a9eee68181e92bad2c9b | |
| parent | 3b84208212727833ccebea3fef03901331f5a12d [diff] [blame] |
Fix Settings build. Broken due to a bogus merge conflict resolution. Change-Id: Id4e3215ac964ebac792e29f50741b020c06d11f4
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 575fed4..8f2f0fd 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java
@@ -302,7 +302,7 @@ NotificationAppList.class.getName(), AppNotificationSettings.class.getName(), OtherSoundSettings.class.getName(), - ApnSettings.class.getName() + ApnSettings.class.getName(), QuickLaunchSettings.class.getName(), WifiCallingSettings.class.getName() };