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

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

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

Conflicts:
	core/binary.mk
	core/tasks/cts.mk
parents 60840290 4f2436dc
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