commit 28e9733e35f3a3b7f7780bfe45507b6e79a05a6f
author RoboErik <epastern@google.com> Thu Oct 27 21:45:44 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 27 21:45:44 2011 +0000
tree 2b86c7c0284ba163430d9796eca1fff8d458035b
parent b4a9fd9fafb0aa222b5a5e425d3335789cc93c04
parent 8805dc137ad2c254f25117a5eb1fd662a4ef63b0

am 8805dc13: Merge "b/5309787 Add new columns to hidden list of read only fields" into ics-mr1

* commit '8805dc137ad2c254f25117a5eb1fd662a4ef63b0':
  b/5309787 Add new columns to hidden list of read only fields

core/java/android/provider/CalendarContract.java

diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java
index 02c6510..413150b 100644
--- a/core/java/android/provider/CalendarContract.java
+++ b/core/java/android/provider/CalendarContract.java
@@ -1545,6 +1545,8 @@
                 CAL_SYNC9,
                 CAL_SYNC10,
                 ALLOWED_REMINDERS,
+                ALLOWED_ATTENDEE_TYPES,
+                ALLOWED_AVAILABILITY,
                 CALENDAR_ACCESS_LEVEL,
                 CALENDAR_COLOR,
                 CALENDAR_TIME_ZONE,