tree 5a235144c2f3a820250b15099e97803983ff8152
parent 4c7a2fac3b7b92292006e524d59ccce34feb0c99
parent c9102f2ae2c6d4692a2fea43ec6ba9b27ccc9428
author Fyodor Kupolov <fkupolov@google.com> 1477615152 +0000
committer android-build-merger <android-build-merger@google.com> 1477615152 +0000

[DO NOT MERGE] Only setSize if -s arg is specified am: b87a491de6 am: 7c9a91094d
am: c9102f2ae2

Change-Id: I28e06c6345e847ade9a89824675302fdf58e1ba9