Profiles: Fix override item summary not displaying none

* Mismerge from cm-12.1

Change-Id: Ica5bce4f1b371dcf2ad23ba8f938d449a9397339

diff --git a/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java b/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java
index 1ad8573..3214174 100644 (file)
--- a/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java
+++ b/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java
@@ -122,7 +122,7 @@ public class ConnectionOverrideItem implements Item {
                     return R.string.profile_action_disable;
                 }
             } else {
-                return R.string.profile_action_disable;
+                return R.string.profile_action_none;
             }
         } else {
             return R.string.profile_action_none;