tree 2216a2392069bd64aee39f6229b6d5d969d910e8
parent 19e7776451a874bf52ca597fbf7dd8aafd18befa
parent 2c467f6e490f868597f2687d26f5eccbdde73a2a
author Sen Jiang <senj@google.com> 1487280192 +0000
committer android-build-merger <android-build-merger@google.com> 1487280192 +0000

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

Change-Id: Id7641e953d6ca749e20ecfb126a39392b6db3dab