commit 42c7ff127ed618bf71f58a201700c9ded918d7d8
author Lorenzo Colitti <lorenzo@google.com> Fri Jan 30 15:58:39 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 30 15:58:39 2015 +0000
tree 05c589571a7e445215ce4c7c40f0ccb5e0a666cd
parent a8a5ea3416d006a69e634fd3a10978889cb3d76f
parent bac14852ef54d17bbef04f1eb2cc03a540fee0a1

Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" automerge: c0e636a automerge: 786deba
automerge: bac1485

* commit 'bac14852ef54d17bbef04f1eb2cc03a540fee0a1':
  Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index cdc8661..1a51808 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -504,6 +504,8 @@
                 return "MOBILE_EMERGENCY";
             case TYPE_PROXY:
                 return "PROXY";
+            case TYPE_VPN:
+                return "VPN";
             default:
                 return Integer.toString(type);
         }