am 1a5f387b: Merge "Revert "Don\'t update the text services locale in the main thread"" into jb-mr1-dev
am 1a5f387b: Merge "Revert "Don\'t update the text services locale in the main thread"" into jb-mr1-dev

* commit '1a5f387bcf26a6845a4fa744b8f54449ae70082f':
  Revert "Don't update the text services locale in the main thread"

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base