Merge change I38167f11 into eclair-mr2

* changes:
  Add commented-out support for CalendarProvider2.