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

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

Merge branch 'gingerbread' of git://git.omapzoom.org/platform/build into 237 

Conflicts:
	envsetup.sh
	target/product/full.mk
	target/product/full_base.mk
	target/product/locales_full.mk

Change-Id: I7d31fcea78b20548d873484b1492299f9fed3feb
parents e9cbfa60 0cc5e1ef
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