commit | 0cac5caba664dc1bdf44dbeb594fe306315cecea | [log] [tgz] |
---|---|---|
author | The Android Automerger <android-build@google.com> | Wed May 28 10:09:28 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 28 10:09:28 2014 +0000 |
tree | b46c9856ac93ec86f20a6bd1fcc35fb457bd3fe7 | |
parent | f2b995769bf55b07797e05b4474457f910d5aa7a [diff] | |
parent | 770626e07460b90c377b980abc8e3e3365bfa9f1 [diff] |
am 770626e0: merge in master-release history after reset to dc1e70b379415531aa4344bceca299f9ca662444 * commit '770626e07460b90c377b980abc8e3e3365bfa9f1': Revert "Use PrevWordsInfo for get/add/remove n-gram(bigram) entry." Fix a NPE in DistracterFilter.isDistracterToWordsInDictionaries() Fix NPE Fix: NPE after onDestroy(). Fix a null object reference crash on Emoji Palette Fix an NPE. Revert "Fix a race condition."