Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into replicant-6.0

1 files changed, 3 insertions, 1 deletions

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 0cfbfae..a52af29 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -123,7 +123,9 @@ public class Settings extends SettingsActivity {
     public static class BlacklistSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ProfilesSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ContributorsCloudActivity extends SettingsActivity { /* empty */ }
-    public static class SoundSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class CMSoundSettingsActivity extends SettingsActivity { /* empty */ }
     public static class LockScreenSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class LiveLockScreenSettingsActivity extends SettingsActivity { /* empty */ }
     public static class NotificationManagerActivity extends SettingsActivity { /* empty */ }
+    public static class WeatherProviderServicesActivity extends SettingsActivity { /* empty */ }
 }