am ba11b9d7: am 595242cb: Add multiple account support to CalendarProvider2.

Merge commit 'ba11b9d78b3ad3d05c76032c9ad2b07654ec75c7'

* commit 'ba11b9d78b3ad3d05c76032c9ad2b07654ec75c7':
  Add multiple account support to CalendarProvider2.