OSDN Git Service

Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am: 92d0316...
authorSiyamed Sinir <siyamed@google.com>
Fri, 27 May 2016 23:40:05 +0000 (23:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 23:40:05 +0000 (23:40 +0000)
commit686e0545c7e167f7535395cb770de76836702bb1
tree33f674ec4948d24d8d51eb39eb24bbde49ddc019
parentb21f69181f89ccb4ddee757e37bfaad09eb9d02e
parent3e7177f91f7e7097dcc4f6613c8baf7fff5a333e
Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am: 92d0316d28 am: 361f03c4e2
am: 3e7177f91f

* commit '3e7177f91f7e7097dcc4f6613c8baf7fff5a333e':
  Set StaticLayout.maxLines only when ellipsize is set

Change-Id: Ic21d60a789a0361ffca8362621fa03ded8d96ae5
core/java/android/widget/TextView.java