am b2d7c60f: am ae210437: Merge change I7082e366 into eclair

Merge commit 'b2d7c60f125e243d915fae037b30f54110f1b237' into eclair-mr2-plus-aosp

* commit 'b2d7c60f125e243d915fae037b30f54110f1b237':
  Properly implement Paint.breakText for layoutlib.