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

* commit 'd63b992210e40f5af7a7fa5b2c2b6b831c75d468':
  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