tree f5e2c6de84dc1383c12b5120af2afdcea35c798a
parent 198db195af465d2413724b1a532f417f5ccd707a
parent 03470497683794ed3e91098696c4dbd16441ace7
author Alex Deymo <deymo@google.com> 1510308065 +0000
committer android-build-merger <android-build-merger@google.com> 1510308065 +0000

Merge "Include bspatch.h from bsdiff/" am: 29cd3215ec am: e73bca40dc
am: 0347049768

Change-Id: I67d921d4067ae55eed562e5364a5ad80594a6a21