tree 2216a2392069bd64aee39f6229b6d5d969d910e8
parent b1b8e89db8e83cf6448f075abfa9ebc5738f1803
parent 6f068903438dc50ac17a19e14cbbbd2bf9589638
author Sen Jiang <senj@google.com> 1487280401 +0000
committer android-build-merger <android-build-merger@google.com> 1487280401 +0000

Merge "Use bspatch from external/bsdiff." am: f9962dbfe2 am: 2c467f6e49
am: 6f06890343

Change-Id: I6e49f937f1145dba2c5500f25db5020fca7ceac0