am d2cd9467: Suppress warning around old vcard code.

Merge commit 'd2cd9467b876777d512911fadeb948e58b9de257' into eclair-plus-aosp

* commit 'd2cd9467b876777d512911fadeb948e58b9de257':
  Suppress warning around old vcard code.

core/java/android/syncml/pim/VParser.java

@@ -23,7 +23,6 @@ import java.io.UnsupportedEncodingException;
 
 /**
  * This interface is used to parse the V format files, such as VCard & VCal
- *
  */
 @Deprecated
 abstract public class VParser {

core/java/android/syncml/pim/vcard/ContactStruct.java

@@ -17,12 +17,10 @@
 package android.syncml.pim.vcard;
 
 import android.content.AbstractSyncableContentProvider;
-import android.content.ContentProviderOperation;
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.net.Uri;
-import android.provider.CallLog;
 import android.provider.Contacts;
 import android.provider.CallLog.Calls;
 import android.provider.Contacts.ContactMethods;

core/java/android/syncml/pim/vcard/VCardComposer.java

@@ -29,8 +29,6 @@ import android.syncml.pim.vcard.ContactStruct.PhoneData;
 
 /**
  * Compose VCard string
- * 
- * @depricated Please use the code in android.pim.vcard
  */
 @Deprecated
 public class VCardComposer {

core/java/android/syncml/pim/vcard/VCardDataBuilder.java

@@ -47,8 +47,6 @@ import java.util.List;
  * If we store all VNode entries in memory like VDataBuilder.java,
  * OutOfMemoryError may be thrown. Thus, this class push each VCard entry into
  * ContentResolver immediately.
- * 
- * @depricated Please use the code in android.pim.vcard
  */
 @Deprecated
 public class VCardDataBuilder implements VBuilder {

core/java/android/syncml/pim/vcard/VCardEntryCounter.java

@@ -20,9 +20,6 @@ import java.util.List;
 
 import android.syncml.pim.VBuilder;
 
-/**
- * @depricated Please use the code in android.pim.vcard
- */
 @Deprecated
 public class VCardEntryCounter implements VBuilder {
     private int mCount;

core/java/android/syncml/pim/vcard/VCardException.java

@@ -16,9 +16,6 @@
 
 package android.syncml.pim.vcard;
 
-/**
- * @depricated Please use the code in android.pim.vcard
- */
 @Deprecated
 public class VCardException extends java.lang.Exception{
     // constructors

core/java/android/syncml/pim/vcard/VCardNestedException.java

@@ -18,8 +18,6 @@ package android.syncml.pim.vcard;
 
 /**
  * VCardException thrown when VCard is nested without VCardParser's being notified.
- *
- * @depricated Please use the code in android.pim.vcard
  */
 @Deprecated
 public class VCardNestedException extends VCardException {

core/java/android/syncml/pim/vcard/VCardParser.java

@@ -23,9 +23,6 @@ import android.util.Log;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
-/**
- * @deprecated Please use the code in android.pim.vcard
- */
 @Deprecated
 public class VCardParser {
 

core/java/android/syncml/pim/vcard/VCardParser_V21.java

@@ -31,8 +31,6 @@ import java.util.HashSet;
 
 /**
  * This class is used to parse vcard. Please refer to vCard Specification 2.1.
- *
- * @deprecated Please use the code in android.pim.vcard
  */
 @Deprecated
 public class VCardParser_V21 {

core/java/android/syncml/pim/vcard/VCardParser_V30.java

@@ -25,8 +25,6 @@ import java.util.HashSet;
 /**
  * This class is used to parse vcard3.0. <br>
  * Please refer to vCard Specification 3.0 (http://tools.ietf.org/html/rfc2426)
- * 
- * @deprecated Please use the code in android.pim.vcard
  */
 @Deprecated
 public class VCardParser_V30 extends VCardParser_V21 {

core/java/android/syncml/pim/vcard/VCardSourceDetector.java

@@ -26,8 +26,6 @@ import java.util.Set;
 /**
  * Class which tries to detects the source of the vCard from its properties.
  * Currently this implementation is very premature.
- * 
- * @deprecated Please use the code in android.pim.vcard
  */
 @Deprecated
 public class VCardSourceDetector implements VBuilder {

core/java/android/syncml/pim/vcard/VCardVersionException.java

@@ -18,8 +18,6 @@ package android.syncml.pim.vcard;
 
 /**
  * VCardException used only when the version of the vCard is different.
- * 
- * @deprecated Please use the code in android.pim.vcard
  */
 @Deprecated
 public class VCardVersionException extends VCardException {