From 80b4c3500b66b88729fc5f792b7d7719975396b4 Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Fri, 25 Dec 2015 11:47:40 +0100
Subject: Profiles: Fix override item summary not displaying none

* Mismerge from cm-12.1

Change-Id: Ica5bce4f1b371dcf2ad23ba8f938d449a9397339
---
 .../android/settings/profiles/actions/item/ConnectionOverrideItem.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/com/android/settings/profiles')

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
--- 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;
-- 
cgit v1.1