commit a8a5ea3416d006a69e634fd3a10978889cb3d76f
author Lorenzo Colitti <lorenzo@google.com> Thu Jan 29 08:46:07 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 29 08:46:07 2015 +0000
tree 05c589571a7e445215ce4c7c40f0ccb5e0a666cd
parent 6c1da052115ba6ecf18d57aa0225c313b5b59c6a
parent 4137d5fd3ec8bd1dfb898fd92307db81c3648b3c

Merge "Support connecting to networks with misconfigured subnet masks." automerge: bd01ceb automerge: fb69689
automerge: 4137d5f

* commit '4137d5fd3ec8bd1dfb898fd92307db81c3648b3c':
  Support connecting to networks with misconfigured subnet masks.

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);
         }