commit d2147882c64ce99d73891205c668f1683091350b
author Lorenzo Colitti <lorenzo@google.com> Fri Jan 30 15:59:49 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 30 15:59:49 2015 +0000
tree 120bf68821ee71e12b9f76034be3bb890caad6df
parent 42c7ff127ed618bf71f58a201700c9ded918d7d8
parent 792622f75408a475870c7ace2c15b60bff53f974

Merge "Also include the domain when parceling StaticIpConfiguration." automerge: c40bd27 automerge: 5b392ee
automerge: 792622f

* commit '792622f75408a475870c7ace2c15b60bff53f974':
  Also include the domain when parceling 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);
         }