tree 9e8e7e6ec2fa0a8cf614657cdccb19a06fa8f5b8
parent f0e5627cd27cfec03c071039eb42a52a1e3e2ade
parent 93938c10f1bceaa5f09437d985ef7c8966322cdb
author Tianjie Xu <xunchang@google.com> 1527214530 -0700
committer android-build-merger <android-build-merger@google.com> 1527214530 -0700

Merge "Convert deflate image chunks to raw if the raw data is smaller" am: fc0f04cba7 am: 8e72eb7077
am: 93938c10f1

Change-Id: Ib7029502657788ffa18369091dc8eb38065d4369