am ba87fe41: Fix bug #3218104 (CalendarSyncAdapter says "android.content.OperationApplicationException: wrong number of rows: 0") - DO NOT MERGE

* commit 'ba87fe417cad7ba63354f145e32be18b18e77a1d':
  Fix bug #3218104 (CalendarSyncAdapter says "android.content.OperationApplicationException: wrong number of rows: 0") - DO NOT MERGE