OSDN Git Service

Merge changes from topic "siyamed_maxlines" into oc-mr1-dev
authorSiyamed Sinir <siyamed@google.com>
Thu, 24 Aug 2017 19:59:22 +0000 (19:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 24 Aug 2017 19:59:22 +0000 (19:59 +0000)
* changes:
  StaticLayout capped height should be 0 when maxLines=0
  Reset StaticLayout.mEllipsized during generate()


Trivial merge