tree 32edc2048c063f83a95467274f8b2d1cc1d9dd27
parent 84a978cbcf6e5d41ecd49c010ed33f936d4ebfe7
parent 4cf3bc18756782bfe09f683b0a52431f4430ec33
author Tao Bao <tbao@google.com> 1524248126 -0700
committer android-build-merger <android-build-merger@google.com> 1524248126 -0700

Merge "applypatch: Drop the SHA_CTX parameter in Apply{BSDiff,Image}Patch." am: bcb015239c
am: 4cf3bc1875

Change-Id: I211d0252ae33cc8fc203360de8d982c2a3b597ae