OSDN Git Service

Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am: 92d0316d28
authorSiyamed Sinir <siyamed@google.com>
Fri, 27 May 2016 18:55:30 +0000 (18:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 18:55:30 +0000 (18:55 +0000)
commit3e7177f91f7e7097dcc4f6613c8baf7fff5a333e
tree38a2d9d53b15f8a13ca672f2c0a45d0a4643aba5
parent1099ea59c575f4445364359cfa74d9afb6d1dd4d
parent361f03c4e2c774c074ef98ab2631e28288690034
Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am: 92d0316d28
am: 361f03c4e2

* commit '361f03c4e2c774c074ef98ab2631e28288690034':
  Set StaticLayout.maxLines only when ellipsize is set

Change-Id: I15d616a7b448dc8e63c1a7d0ac136be98669a869