am 7ff28ad2: (-s ours) Merge "round subpixels up to next integer in...
am 7ff28ad2: (-s ours) Merge "round subpixels up to next integer in measureText DO NOT MERGE" into jb-mr2-dev
* commit '7ff28ad2':
round subpixels up to next integer in measureText DO NOT MERGE