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

Skip to content
Commit 36d4d5ce authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Merge commit '1dac277f' into manualmerge 

Required rewriting the okay battery broadcast stuff.

Conflicts:
	services/java/com/android/server/status/StatusBarPolicy.java
parents cee89ad2 1f6696b8
Hide 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