am 525ac80d: Merge "Create a thread_local cache for textLocale" into mnc-dev
am 525ac80d: Merge "Create a thread_local cache for textLocale" into mnc-dev

* commit '525ac80d2dda4ce7a902b67d082ed26d0986f525':
  Create a thread_local cache for textLocale

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