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

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

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

Conflicts:
	res/values-af/strings.xml
	res/values-bg/strings.xml

Change-Id: Iea8b8adaaf5d210a881e8300a09c554c0d63181c
parents b05f9203 a6ff5f05
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