OSDN Git Service

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

* commit '79c0b2bcbbf2677de9a05c4baaa07c6796ea1583':
  Also update setMinLines

Change-Id: I34792f349b421e20849ad1db2a28d2751c994189