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

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