tree 1d5140f8a0daf19c920a937f028e43a1e38079c2
parent 66f59dc1bde15be207d49fafb97db372cb01d977
parent 5d1654a9439f0ed81ecccecfacda34872270dfcb
author Raph Levien <raph@google.com> 1436554116 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436554116 +0000

am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev

* commit '5d1654a9439f0ed81ecccecfacda34872270dfcb':
  Fix StaticLayout crash when maxLines = 0