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

Skip to content
Commit bbdc3454 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1

Conflicts:
	java/res/values-cs/strings.xml
	java/res/values/donottranslate.xml
	java/res/values/styles.xml
	java/res/xml/key_styles_common.xml
	java/src/com/android/inputmethod/keyboard/Keyboard.java
	java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
	java/src/com/android/inputmethod/latin/StringUtils.java
	java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
	native/jni/src/char_utils.cpp
	tools/maketext/res/values-hu/donottranslate-more-keys.xml
	tools/maketext/res/values/donottranslate-more-keys.xml

Change-Id: I9198d9c7eff357b105b9a8bdafc969531e8eaa2b
parents e29a7475 a063ccb0
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment