am f999879c: Merge "Account for text alignment in Op bounds calculation" into jb-mr2-dev
am f999879c: Merge "Account for text alignment in Op bounds calculation" into jb-mr2-dev

* commit 'f999879ce01117ea8ca292403a7104b0e7d46bdc':
  Account for text alignment in Op bounds calculation

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