tree c031169e1c500b3d684d591e0f6c206dd2ff3b85
parent 4583aa65e9b73b2b652919027703435a6ef24beb
author Chris Craik <ccraik@google.com> 1484089748 -0800
committer gitbuildkicker <android-build@google.com> 1485304718 -0800

Handle small sized webps correctly

fix merge conflict into nyc-bugfix-release
bug:33718716
Change-Id: I54d63d54c7057828dfca1ab4ef47a44760e94ece

(cherry picked from commit 51b23ccc575bcc31b68e97f71089636d551e9a25)