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

Skip to content
Commit 948aa8d1 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'jb-mr0-release' of... 

Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/packages/apps/Calendar into aosp-merge

Conflicts:
	res/values-fa/strings.xml

Change-Id: I45d5ad8aab6a6d5bb77a644d467477207d73d70d
parents 3ca997a6 02fd9828
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