OSDN Git Service

Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev
authorSiyamed Sinir <siyamed@google.com>
Fri, 27 May 2016 18:45:17 +0000 (18:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 18:45:17 +0000 (18:45 +0000)
commit3f23dad913859d725ad1b63b12ee0e800a47beb7
treed9a2ac721cc91e3662d0d76ea8ebe3e85ec2a351
parent1743e97f3a1ec9c40b3c799ca34cf01186e38f35
parent92d0316d2837baceffb22e1a7eb0e5da50f0a025
Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev
am: 92d0316d28

* commit '92d0316d2837baceffb22e1a7eb0e5da50f0a025':
  Set StaticLayout.maxLines only when ellipsize is set

Change-Id: I17934afae1d5e8b7fe3b3ad8b4286dd43f68393e