am 49910a9d: Merge "Fix: release lock in UserHistoryDictionary."

* commit '49910a9d774120479d89f537c7e1b4d43e6f153a':
  Fix: release lock in UserHistoryDictionary.

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

@@ -320,7 +320,11 @@ public final class UserHistoryDictionary extends ExpandableDictionary {
                     mUserHistoryDictionary.mBigramListLock.unlock();
                 }
             } else if (mUserHistoryDictionary.mBigramListLock.tryLock()) {
-                doWriteTaskLocked();
+                try {
+                    doWriteTaskLocked();
+                } finally {
+                    mUserHistoryDictionary.mBigramListLock.unlock();
+                }
             }
             return null;
         }