am 27e2b6c2: am 0aaffb14: Merge "Don\'t update the text services locale in the...
am 27e2b6c2: am 0aaffb14: Merge "Don\'t update the text services locale in the main thread" into jb-mr1-dev
* commit '27e2b6c2':
Don't update the text services locale in the main thread