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

Skip to content
Commit f1dcbf6c authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'eclair' of git://android.git.kernel.org/platform/frameworks/base into HEAD 

Conflicts:
	services/java/com/android/server/PackageManagerService.java
parents 64ea9145 7d39f981
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