am e89ad6c2: am d63b9922: Merge "Fix bug #6908329 TextUtils.ellipsize does not work properly when Locale is changed" into jb-mr1-dev
am e89ad6c2: am d63b9922: Merge "Fix bug #6908329 TextUtils.ellipsize does not work properly when Locale is changed" into jb-mr1-dev

* commit 'e89ad6c20fda6f2d5bf983dc32debfb7a177346e':
  Fix bug #6908329 TextUtils.ellipsize does not work properly when Locale is changed

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