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

Commit aea51add authored by Steve Kondik's avatar Steve Kondik
Browse files

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

Conflicts:
	services/java/com/android/server/PowerManagerService.java
parents 736878a6 b37bca9e
Expand all 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