resolved conflicts for merge of 5b048292 to master

java/src/com/android/inputmethod/keyboard/KeyboardView.java

...rc/com/android/inputmethod/keyboard/MainKeyboardView.java

.../src/com/android/inputmethod/keyboard/PointerTracker.java

...d/inputmethod/keyboard/internal/TouchScreenRegulator.java

...com/android/inputmethod/latin/BinaryDictionaryGetter.java

java/src/com/android/inputmethod/latin/LatinIME.java

...rc/com/android/inputmethod/latin/RichInputConnection.java

java/src/com/android/inputmethod/latin/SettingsFragment.java

.../com/android/inputmethod/latin/define/ProductionFlag.java

...id/inputmethod/latin/suggestions/SuggestionStripView.java

java/src/com/android/inputmethod/research/LogStatement.java

java/src/com/android/inputmethod/research/LogUnit.java

java/src/com/android/inputmethod/research/MainLogBuffer.java

...c/com/android/inputmethod/research/MotionEventReader.java

java/src/com/android/inputmethod/research/Replayer.java

java/src/com/android/inputmethod/research/ResearchLog.java

.../src/com/android/inputmethod/research/ResearchLogger.java

java/src/com/android/inputmethod/research/Statistics.java

java/src/com/android/inputmethod/research/Uploader.java

...src/com/android/inputmethod/research/UploaderService.java