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

Skip to content
Commit 8ffe7b76 authored by Mark Ashdown's avatar Mark Ashdown
Browse files

Merge remote-tracking branch 'goog/jb-ub-now-kermit' into kermit-release 

Conflicts:
	src/com/android/launcher3/LauncherClings.java

Change-Id: Idd2e6d54180315854216cfc868cd36297dcb95d9
parents 71c92b35 f8584042
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