diff options
| author | Dave Santoro <dsantoro@google.com> | 2011-11-08 14:48:21 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-08 14:48:21 -0800 |
| commit | b78ae7524eecbca01a53994d6872202633c8341b (patch) | |
| tree | c472630e419c1fb7088d431fd54c0fc871f108fa /core/java | |
| parent | 650a3e8894c6d26b258d26bdec856fde7aba43d6 (diff) | |
| parent | 003924c37afd8f4593b844ff06dbfd84a6fc1a23 (diff) | |
| download | frameworks_base-b78ae7524eecbca01a53994d6872202633c8341b.zip frameworks_base-b78ae7524eecbca01a53994d6872202633c8341b.tar.gz frameworks_base-b78ae7524eecbca01a53994d6872202633c8341b.tar.bz2 | |
Merge "Unhide social stream APIs for Contacts." into ics-mr1
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index ff28596..821b6df 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -1673,7 +1673,6 @@ public final class ContactsContract { * Querying for social stream data requires android.permission.READ_SOCIAL_STREAM * permission. * </p> - * @hide */ public static final class StreamItems implements StreamItemsColumns { /** @@ -2736,7 +2735,6 @@ public final class ContactsContract { * inserting or updating social stream items requires android.permission.WRITE_SOCIAL_STREAM * permission. * </p> - * @hide */ public static final class StreamItems implements BaseColumns, StreamItemsColumns { /** @@ -3149,7 +3147,6 @@ public final class ContactsContract { * </pre> * </dd> * </dl> - * @hide */ public static final class StreamItems implements BaseColumns, StreamItemsColumns { /** @@ -3247,7 +3244,6 @@ public final class ContactsContract { * Columns in the StreamItems table. * * @see ContactsContract.StreamItems - * @hide */ protected interface StreamItemsColumns { /** @@ -3538,7 +3534,6 @@ public final class ContactsContract { * <pre> * </dd> * </dl> - * @hide */ public static final class StreamItemPhotos implements BaseColumns, StreamItemPhotosColumns { /** @@ -3566,7 +3561,6 @@ public final class ContactsContract { * Columns in the StreamItemPhotos table. * * @see ContactsContract.StreamItemPhotos - * @hide */ protected interface StreamItemPhotosColumns { /** |