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

Skip to content
Commit 363e22f3 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'gingerbread' of... 

Merge branch 'gingerbread' of git://android.git.kernel.org/platform/packages/inputmethods/LatinIME into upstream-2.3.5

Conflicts:
	java/res/values-zh-rTW/strings.xml
	java/src/com/android/inputmethod/latin/InputLanguageSelection.java

Change-Id: I55b8626d8f5afc6aedddccdd3822497540a1fdb5
parents 6f8c6897 52fbad88
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