tree a0d3184cd592ad6d721f63f54513f471469fcfb4
parent 7d53a05876392e51ad54f4b493cbcf8e0c539f94
parent 8b44db55d3201ab955bbe97534d25d70cca72f23
author Fyodor Kupolov <fkupolov@google.com> 1477615758 +0000
committer android-build-merger <android-build-merger@google.com> 1477615758 +0000

Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev am: e97969b4d0 am: 74bd9b1f56 am: 9b006e28f9
am: 8b44db55d3  -s ours

Change-Id: I6c478eea6884184098c783eea507ece48f54bee6