tree ab70e1b1c25a859cccf2536b389bd04bcfc273bc
parent 151ccb9f580e0082c571e50e4817ccd1cdd4379d
parent 741d6120be20200e5ff6484c8b7293dfc4880dba
author Raph Levien <raph@google.com> 1430528880 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430528880 +0000

am 741d6120: am 5c268763: Merge "Expose StaticLayout.Builder publicly" into mnc-dev

* commit '741d6120be20200e5ff6484c8b7293dfc4880dba':
  Expose StaticLayout.Builder publicly