am 3df01599: Merge "Fix for AOOB in MeasuredText"
am 3df01599: Merge "Fix for AOOB in MeasuredText"

* commit '3df01599879e2bed32960911394fc9e2a8fcbc33':
  Fix for AOOB in MeasuredText

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