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

Commit d7f59d4c authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'gingerbread' of git://android.git.kernel.org/platform/frameworks/base into sk 

Conflicts:
	core/res/res/values-zh-rTW/strings.xml

Change-Id: Ieab15ccccc3bdaf9184210c0066a9e9575a8407b
parents 10688619 4d53cb02
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