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

Skip to content
Commit 066b5c51 authored by Joe Onorato's avatar Joe Onorato
Browse files

manual merge Merge commit '77e42376' into work 

Conflicts:
	packages/SystemUI/res/values/colors.xml
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java

Change-Id: I891c8a9f6410037ca7805507e85a17f1655c115e
parents 4243a3a6 77e42376
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