Merge remote-tracking branch 'goog/master' into HEAD

Conflicts:
	Android.mk

Change-Id: Ibf661a0b8c1d198ee01998405b81bb7919c17aaf
Rename calendarcommon to calendarcommon2 to workaround OEM silliness

Change-Id: I5bd618866d6484037671376e192ee3217c42c366
am eb95cfa4: (-s ours) Merge remote-tracking branch \'goog/master\' into HEAD

* commit 'eb95cfa41925d2c286075236688d6473999c954e':
am 50484452: Rename calendarcommon to calendarcommon2 to workaround OEM silliness

* commit '504844526f1b7afec048c6d2976ffb332670d5ba':
  Rename calendarcommon to calendarcommon2 to workaround OEM silliness
Fix issue with invisible recurring appointments

Fixes that recurring appointments goes invisible
when hit by the failsafe limit.

There is still a hard limit in RecurrenceProcessor,
but at least this limit is applied on a per-event
basis, meaning that it's always possible to create
new recurring appointments without them going invisible.

Change-Id: I6c9e1e10db78e1b73ea9f2b7104621fbbd906452
Make this build in Eclipse

Change-Id: Ib34de4361aaa93c5ee9d573557931f9e24905dd6
Merge remote-tracking branch 'goog/ics-ub-calendar-cream' into catchup
Fix issue with invisible recurring appointments

Fixes that recurring appointments goes invisible
when hit by the failsafe limit.

There is still a hard limit in RecurrenceProcessor,
but at least this limit is applied on a per-event
basis, meaning that it's always possible to create
new recurring appointments without them going invisible.

Change-Id: I6c9e1e10db78e1b73ea9f2b7104621fbbd906452
Merge remote-tracking branch 'goog/ics-ub-calendar-cream' into catchup
Split EXDATE with a Newline Delimiter

So we can support multiple exdate values.

Bug: 8331334
Change-Id: Ica70f7719f629fcedbec2e781d812045ef0de59f
Merge tag 'android-4.3_r2.1' into jellybean-mr2.1

Android 4.3 release 2.1