commit 214f74313135f1027dae0c7792b652ca1b9f4914
author Jean Chalard <jchalard@google.com> Thu Jul 31 13:35:18 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 31 13:35:18 2014 +0000
tree 15e5198c795dcc92ef71b19c1837e323e7a17dbe
parent 77aa7a92932165b7b57ab6fb115b7cb44dc5611a
parent 795711f5f91001416c0aab38203c3aa7a9bc9f98

am 795711f5: am 69b68b59: Fix some unit tests.

* commit '795711f5f91001416c0aab38203c3aa7a9bc9f98':
  Fix some unit tests.

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

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java b/java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java
index 870ac86..d6d0b21 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java
@@ -113,7 +113,7 @@
         boolean mIsSpellChecker;
         int mKeyboardWidth;
         int mKeyboardHeight;
-        int mScriptId;
+        int mScriptId = ScriptUtils.SCRIPT_LATIN;
         // Sparse array of KeyboardLayoutSet element parameters indexed by element's id.
         final SparseArray<ElementParams> mKeyboardLayoutSetElementIdToParamsMap =
                 new SparseArray<>();