tree 326218401bd04afa96897468469d6c9b7c5fc09e
parent da1fcf7ab2c0f63c85fa0d2596fc64699225989e
parent 4a2cfffd33f5355581fb224f5e1a98ec0969a313
author Tianjie Xu <xunchang@google.com> 1495840807 +0000
committer android-build-merger <android-build-merger@google.com> 1495840807 +0000

Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af am: 0f8e67088a
am: 4a2cfffd33

Change-Id: Ifd32f346adefb90d043bccc3d6f20060ae3ca45d