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

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

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

Conflicts:
	core/version_defaults.mk
	target/product/languages_full.mk

Change-Id: Icd9b716c52b28a919241fa21bb63c53dc08ee620
parents cdb74560 886e5aa7
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