tree 67e4b121c8a9ea059ee6e43472fa17a6f8b29920
parent eefefc6c1369e3df05a55a513119909e8abd14d9
parent 1562f41348aa2c283064cd8ee541ee142aec71cb
author Tianjie Xu <xunchang@google.com> 1495146055 +0000
committer android-build-merger <android-build-merger@google.com> 1495146055 +0000

Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 am: 8f68accc9d
am: 1562f41348

Change-Id: I7b605673eb3cee6a615459ca9fe2fc00c532ed9d