tree 9e8e7e6ec2fa0a8cf614657cdccb19a06fa8f5b8
parent 8706d3336e417adc1d74089730881a76dea7b771
parent 8e72eb70775fa75ab9d37a69b28f91740a1dcbc0
author Tianjie Xu <xunchang@google.com> 1527203877 -0700
committer android-build-merger <android-build-merger@google.com> 1527203877 -0700

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

Change-Id: Ie2b2b87adcb4f80d2e895e7de4f1b200f721394c