OSDN Git Service

Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev am: e9796...
authorFyodor Kupolov <fkupolov@google.com>
Fri, 28 Oct 2016 00:31:47 +0000 (00:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Oct 2016 00:31:47 +0000 (00:31 +0000)
am: 74bd9b1f56

Change-Id: I56b83ec38059af3d15d3ad123ebe96bf7330dbbe


Trivial merge