Merge "Fix bug #1661857 (switch from using meta feed to the new allcalendars feed)"
b/2635697 Makes recurring events disappear immediately when deleted

We had added a special check to make sure deletion exceptions weren't reexpanded
but deleted recurrences were still being reexpanded until after they synced up
to the server and the underlying event was removed. This change prevents deleted
recurring events from being expanded in the instances table. Also needed to delete
all exceptions to the event ( b/1383817 ).

Change-Id: Ia9bb69e35c34086f691653fe24aad6d96a211da9
Merge commit '370f91c0cfe5a5fecaba6120e703f4d2271d2277' into oxygen_1006

* commit '370f91c0cfe5a5fecaba6120e703f4d2271d2277':
  b/2635697 Makes recurring events disappear immediately when deleted

Conflicts:
	src/com/android/providers/calendar/CalendarProvider2.java