am 0cac5cab: am 770626e0: merge in master-release history after reset to dc1e70b379
* 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."main
commit
f9fa3aa422