am 02e55646: Merge change I5a7cf57f into eclair-mr2

Merge commit '02e5564690b3bb30d4f9cebfff7e4b94009098ba' into eclair-mr2-plus-aosp

* commit '02e5564690b3bb30d4f9cebfff7e4b94009098ba':
  New calendar sync framework: code review changes, support delete, support multiple calendars, remove triggers.