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

Commit 95906af2 authored by Matthew Williams's avatar Matthew Williams
Browse files

Merge commit '0e0f6003' into manualmerge 

Conflicts:
	services/java/com/android/server/content/SyncManager.java

Change-Id: If4c3275300892934e11faa7a624c1f2486a64c08
parents 69fdba4c 0e0f6003
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment