Merge "Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am: 92d0316d28 am: 3f23dad913" into nyc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2016-05-27 18:57:15 +00:00
committed by Android (Google) Code Review

Diff Content Not Available