Merge tag 'android-4.3_r2.1' into HEAD

Android 4.3 release 2.1

Conflicts:
	dictionaries/en_us_wordlist.xml.gz
	dictionaries/en_whitelist.xml.gz
	dictionaries/en_wordlist.xml.gz
	java/res/drawable-hdpi/suggestion_feedback_background.9.png
	java/res/drawable-mdpi/suggestion_feedback_background.9.png
	java/res/drawable-xhdpi/suggestion_feedback_background.9.png
	java/res/mipmap-hdpi/ic_ime_settings.png
	java/res/mipmap-mdpi/ic_ime_settings.png
	java/res/mipmap-xhdpi/ic_ime_settings.png
	java/res/mipmap-xxhdpi/ic_ime_settings.png
	java/res/raw/main_de.dict
	java/res/raw/main_es.dict
	java/res/raw/main_fr.dict
	java/res/raw/main_it.dict
	java/res/raw/main_pt_br.dict
	java/res/raw/main_ru.dict
	java/res/values/config.xml
	java/res/values/donottranslate.xml
	java/res/values/research_strings.xml
	java/res/values/strings-appname.xml
	java/res/values/strings.xml
	java/res/values/styles.xml
	java/res/xml/method.xml
	java/res/xml/prefs.xml
	java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
	java/src/com/android/inputmethod/keyboard/KeyboardView.java
	java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
	java/src/com/android/inputmethod/keyboard/PointerTracker.java
	java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
	java/src/com/android/inputmethod/keyboard/internal/TouchScreenRegulator.java
	java/src/com/android/inputmethod/latin/DebugSettings.java
	java/src/com/android/inputmethod/latin/LatinIME.java
	java/src/com/android/inputmethod/latin/RichInputConnection.java
	java/src/com/android/inputmethod/latin/Settings.java
	java/src/com/android/inputmethod/latin/SettingsValues.java
	java/src/com/android/inputmethod/latin/define/ProductionFlag.java
	java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
	java/src/com/android/inputmethod/research/BootBroadcastReceiver.java
	java/src/com/android/inputmethod/research/FeedbackActivity.java
	java/src/com/android/inputmethod/research/FeedbackFragment.java
	java/src/com/android/inputmethod/research/FeedbackLayout.java
	java/src/com/android/inputmethod/research/LogBuffer.java
	java/src/com/android/inputmethod/research/LogUnit.java
	java/src/com/android/inputmethod/research/MainLogBuffer.java
	java/src/com/android/inputmethod/research/ResearchLog.java
	java/src/com/android/inputmethod/research/ResearchLogger.java
	java/src/com/android/inputmethod/research/Statistics.java
	java/src/com/android/inputmethod/research/UploaderService.java
	native/jni/src/proximity_info.cpp
	native/jni/src/proximity_info.h
	tests/src/com/android/inputmethod/keyboard/SpacebarTextTests.java
	tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java

Change-Id: If737f0c9f4b617d27818e5cfbe7d87052c33f0ea