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

Skip to content
Commit 429feb15 authored by Steve Kondik's avatar Steve Kondik
Browse files

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

Conflicts:
	tools/releasetools/edify_generator.py

Change-Id: Iadb22c0697bede4650ba15d727603270c1e7a9ec
parents 4c52c585 bd0c91c8
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