Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix immenent build breakage."

Browse Source
This commit is contained in:
RoboErik
2011-10-12 13:45:12 -07:00
committed by Android (Google) Code Review
parent 3db295cd7e fced9521be
commit dc8f43294a
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/provider/CalendarContract.java
View File

@@ -309,7 +309,7 @@ public final class CalendarContract {
* Type: TEXT * Type: TEXT
* </P> * </P>
* TODO UNHIDE * TODO UNHIDE
* *
* @hide * @hide
*/ */
public static final String CALENDAR_COLOR_INDEX = "calendar_color_index"; public static final String CALENDAR_COLOR_INDEX = "calendar_color_index";
@@ -734,8 +734,7 @@ public final class CalendarContract {
/** /**
* The type of attendee. Column name. * The type of attendee. Column name.
* <P> * <P>
* Type: Integer (one of {@link #TYPE_REQUIRED}, {@link #TYPE_OPTIONAL}, * Type: Integer (one of {@link #TYPE_REQUIRED}, {@link #TYPE_OPTIONAL}
* {@link #TYPE_RESOURCE})
* </P> * </P>
*/ */
public static final String ATTENDEE_TYPE = "attendeeType"; public static final String ATTENDEE_TYPE = "attendeeType";
@@ -745,8 +744,8 @@ public final class CalendarContract {
public static final int TYPE_OPTIONAL = 2; public static final int TYPE_OPTIONAL = 2;
/** /**
* This specifies that an attendee is a resource, such as a room, and * This specifies that an attendee is a resource, such as a room, and
* not an actual person. TODO UNHIDE * not an actual person. TODO UNHIDE and add to ATTENDEE_TYPE comment
* *
* @hide * @hide
*/ */
public static final int TYPE_RESOURCE = 3; public static final int TYPE_RESOURCE = 3;