tree b0644f50453fbb27ef71ac0b94381f47c5e858e2
parent 01bcf118d5e22eb7bf3edf248e78480d436e1b18
parent 8f68accc9dc85a12342e333e13f40c3d1af8213f
author Tianjie Xu <xunchang@google.com> 1495145784 +0000
committer android-build-merger <android-build-merger@google.com> 1495145784 +0000

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

Change-Id: Ic81b2812030e8267a4d0d81d4909f84d284d1743