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

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