commit | f9fa3aa422032d7136599b3c64cc735b3227cb08 | [log] [tgz] |
---|---|---|
author | The Android Automerger <android-build@google.com> | Wed May 28 10:13:18 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 28 10:13:18 2014 +0000 |
tree | b46c9856ac93ec86f20a6bd1fcc35fb457bd3fe7 | |
parent | 8fed18fc5ad36d2c6f0ff7d4d4c0022a9ae68bf4 [diff] | |
parent | 0cac5caba664dc1bdf44dbeb594fe306315cecea [diff] |
am 0cac5cab: am 770626e0: merge in master-release history after reset to dc1e70b379415531aa4344bceca299f9ca662444 * commit '0cac5caba664dc1bdf44dbeb594fe306315cecea': 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."