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

Commit bbdc3454 authored Jul 25, 2013 by Ricardo Cerqueira

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

Android.mk

+3 −2

Original line number	Diff line number	Diff line
		# Copyright (C) 2010 The Android Open Source Project
		# Copyright (C) 2013 The Android Open Source Project
		#
		# Licensed under the Apache License, Version 2.0 (the "License");
		# you may not use this file except in compliance with the License.
		@@ -12,4 +12,5 @@
		# See the License for the specific language governing permissions and
		# limitations under the License.

		include $(call all-subdir-makefiles)
		subdirs := native java tests tools
		include $(call all-named-subdir-makefiles, $(subdirs))

dictionaries/cs_wordlist.combined.gz

0 → 100644

+926 KiB

File added.

No diff preview for this file type.

dictionaries/cs_wordlist.xml.gz

deleted100644 → 0

−912 KiB

File deleted.

dictionaries/da_wordlist.combined.gz

0 → 100644

+994 KiB

File added.

No diff preview for this file type.

dictionaries/da_wordlist.xml.gz

deleted100644 → 0

−1000 KiB

File deleted.