am 2f0e6f0c: Merge "Fix off-by-one error in computeEllipsis" into lmp-mr1-dev
am 2f0e6f0c: Merge "Fix off-by-one error in computeEllipsis" into lmp-mr1-dev

* commit '2f0e6f0c7f52427ff542ebb9a28aa489a0f1f909':
  Fix off-by-one error in computeEllipsis

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