OSDN Git Service

Merge "Also update setMinLines" into nyc-dev
authorJorim Jaggi <jjaggi@google.com>
Thu, 2 Jun 2016 19:45:17 +0000 (19:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 2 Jun 2016 19:45:17 +0000 (19:45 +0000)
commit93ef31f1ca85cea95457af3eb6b9dc0bdbb0f9fd
treef0275acb050448526bbcf6d38982fda298c45db5
parentdb3744969e241276ff02c58f9fefc8efb85c2c7d
parent79c0b2bcbbf2677de9a05c4baaa07c6796ea1583
Merge "Also update setMinLines" into nyc-dev
am: 79c0b2bcbb

* commit '79c0b2bcbbf2677de9a05c4baaa07c6796ea1583':
  Also update setMinLines

Change-Id: Iae144dc953cc9e67225ebad2b2e7be777808d1eb