tree 1881bc79a83b1d362856271ff69716440b74682f
parent c42d44bbeb10c1c482f11d34370518f608db1808
parent f9962dbfe244e7552f241328d2270efc79ed5ccc
author Sen Jiang <senj@google.com> 1487279922 +0000
committer android-build-merger <android-build-merger@google.com> 1487279922 +0000

Merge "Use bspatch from external/bsdiff."
am: f9962dbfe2

Change-Id: I21e6de951b22673fe48ff8f7db418e22d233ee58