am 4c0d406d: am 2df1cc43: Merge change I42a80783 into eclair

Merge commit '4c0d406d56894037df7669064e1d67b4f51cdb6d'

* commit '4c0d406d56894037df7669064e1d67b4f51cdb6d':
  Remove deprecated VpnType.getDescription().

tests/AndroidTests/src/com/android/unit_tests/VpnTest.java

@@ -130,7 +130,6 @@ public class VpnTest extends AndroidTestCase {
 
     private void testVpnType(VpnType type) {
         assertFalse(TextUtils.isEmpty(type.getDisplayName()));
-        assertNotNull(type.getDescription());
         assertNotNull(type.getProfileClass());
     }
 

vpn/java/android/net/vpn/VpnType.java

@@ -49,10 +49,6 @@ public enum VpnType {
         return mDescriptionId;
     }
 
-    public String getDescription() {
-        return "";
-    }
-
     public Class<? extends VpnProfile> getProfileClass() {
         return mClass;
     }