Merge "Merge "Fix TextView layout reuse when maxLines is set" into nyc-dev am: e747160509 am: 1a6f583c20" into nyc-mr1-dev-plus-aosp
am: 4d0bc67a79
* commit '4d0bc67a794b1ca4bb83a953c3f1b8b1353873d2':
Change-Id: I8670a9885362119844de493cf4f8cb537f53a9ff
This commit is contained in: