am ab30f486: am fa8570bc: am 7026617e: am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev
am ab30f486: am fa8570bc: am 7026617e: am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev

* commit 'ab30f486ba553d547aac0ff48d87cf307de2871d':
  Respect style boundaries when measuring text

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