am ad9c5718: am a50d0f89: Merge "Hide quota APIs until finalized." into ics-factoryrom

* commit 'ad9c5718daa556fb6907c3f600ea505c1ec3aca0':
  Hide quota APIs until finalized.

core/java/android/net/ConnectivityManager.java

@@ -548,6 +548,8 @@ public class ConnectivityManager {
      * Return quota status for the current active network, or {@code null} if no
      * network is active. Quota status can change rapidly, so these values
      * shouldn't be cached.
+     *
+     * @hide
      */
     public NetworkQuotaInfo getActiveNetworkQuotaInfo() {
         try {

core/java/android/net/NetworkQuotaInfo.java

@@ -21,6 +21,8 @@ import android.os.Parcelable;
 
 /**
  * Information about quota status on a specific network.
+ *
+ * @hide
  */
 public class NetworkQuotaInfo implements Parcelable {
     private final long mEstimatedBytes;