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

Skip to content
Commit f2a88678 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge remote branch 'goog/gingerbread-release' into gingerbread-mr4-release 

Conflicts:
	core/build_id.mk

Change-Id: If3af1b8a02be0eff4373ff62469ccee820ffeb6a
parents 91ce0443 e5796382
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