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

Commit 46b2ef20 authored by Pedlar's avatar Pedlar
Browse files

Merge commit '4aa3a0d3' into froyo 

Conflicts:
	core/java/android/provider/Settings.java
	services/java/com/android/server/NotificationManagerService.java
parents af5f700e 4aa3a0d3
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