Merge change 3226 into donut

* changes:
  Update a javadoc comment suggesting the use of a deprecated class.

telephony/java/com/android/internal/telephony/Phone.java

@@ -229,7 +229,7 @@ public interface Phone {
     /**
      * Get the current DataState. No change notification exists at this
      * interface -- use
-     * {@link com.android.internal.telephony.PhoneStateIntentReceiver PhoneStateIntentReceiver}
+     * {@link com.android.telephony.PhoneStateListener PhoneStateListener}
      * instead.
      */
     DataState getDataConnectionState();