commit 6c1da052115ba6ecf18d57aa0225c313b5b59c6a
author Lorenzo Colitti <lorenzo@google.com> Fri Jan 23 13:05:26 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 23 13:05:26 2015 +0000
tree 05c589571a7e445215ce4c7c40f0ccb5e0a666cd
parent 2530cf6f9fea6db4509490b50667166dd63e24ad
parent 7325a9da748e0d02301a071ec73bcc33acf79d7f

am 50f9d93a: am 68c9c5aa: Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev
automerge: 7325a9d

* commit '7325a9da748e0d02301a071ec73bcc33acf79d7f':
  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);
         }