diff options
| author | Dave Santoro <dsantoro@google.com> | 2011-11-09 14:37:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-09 14:37:19 +0000 |
| commit | b7a262cdc1bfa182c4f08e47385c019c6c2146f3 (patch) | |
| tree | e5521d34e12e65105ce6eac68eb5e8ea994c3e03 /core/java/android/provider | |
| parent | 2690e48d1fd83b19b8da599505453ce0e54a8e10 (diff) | |
| parent | b78ae7524eecbca01a53994d6872202633c8341b (diff) | |
| download | frameworks_base-b7a262cdc1bfa182c4f08e47385c019c6c2146f3.zip frameworks_base-b7a262cdc1bfa182c4f08e47385c019c6c2146f3.tar.gz frameworks_base-b7a262cdc1bfa182c4f08e47385c019c6c2146f3.tar.bz2 | |
am b78ae752: Merge "Unhide social stream APIs for Contacts." into ics-mr1
* commit 'b78ae7524eecbca01a53994d6872202633c8341b':
Unhide social stream APIs for Contacts.
Diffstat (limited to 'core/java/android/provider')
| -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 { /** |