am 38e1c7a8: Merge "Ellipsize marquee TextViews that aren\'t currently animating"
am 38e1c7a8: Merge "Ellipsize marquee TextViews that aren\'t currently animating"

* commit '38e1c7a8a614a491747d08f91aa6eceaee8123fb':
  Ellipsize marquee TextViews that aren't currently animating

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