commit c901766a3746e775d82da72260d6fe87008b718c
author Lorenzo Colitti <lorenzo@google.com> Thu Feb 05 02:41:31 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 05 02:41:31 2015 +0000
tree a1691c07c1e061a9047cec2aadec8a03bf3de172
parent d2147882c64ce99d73891205c668f1683091350b
parent 9fa0471a1577ef3008575a01bb84cbc8fad5138f

am 9fa0471a: am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration."

* commit '9fa0471a1577ef3008575a01bb84cbc8fad5138f':
  Add a unit test for StaticIpConfiguration.

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