Merge change I42a80783 into eclair

* changes:
  Remove deprecated VpnType.getDescription().
diff --git a/vpn/java/android/net/vpn/VpnType.java b/vpn/java/android/net/vpn/VpnType.java
index 322f2bf..356f8b1 100644
--- a/vpn/java/android/net/vpn/VpnType.java
+++ b/vpn/java/android/net/vpn/VpnType.java
@@ -49,10 +49,6 @@
         return mDescriptionId;
     }
 
-    public String getDescription() {
-        return "";
-    }
-
     public Class<? extends VpnProfile> getProfileClass() {
         return mClass;
     }