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

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

Merge branch 'gingerbread' of git://android.git.kernel.org/platform/build into upstream-2.3.5 

Conflicts:
	core/main.mk

Change-Id: I6cec3cdb0097595fde07900a0e5a3531a3a69ec0
parents 1ec9c178 742968bd
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