am b35ad952: Merge "Fix PaintTest#testGetTextWidths Methods" into gingerbread

* commit 'b35ad9523bdb132710c5f28df7d79a30f75a57b6':
  Fix PaintTest#testGetTextWidths Methods