Merge change I42a80783 into eclair

* changes:
  Remove deprecated VpnType.getDescription().

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -49,10 +49,6 @@ public enum VpnType {
		return mDescriptionId;
		}

		public String getDescription() {
		return "";
		}

		public Class<? extends VpnProfile> getProfileClass() {
		return mClass;
		}