Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 603bddaf authored by Michael Chan's avatar Michael Chan
Browse files

Merge remote-tracking branch 'goog/ics-ub-calendar-cream' into catchup 

Conflicts:
	Android.mk
	res/values-de/strings.xml
	src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountActivity.java

Change-Id: Ibee089fc6a12ea9dcde5555992fb873afd501224
parents 2738868c 2ca91649
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment