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:
committed by
Android (Google) Code Review
commit
39cc3f20c2