tree 2c70230fd22650dfe09e96e01cb25f9cec081df2
parent 513c7fb9e06150289e99cc817d5e62a9180ceccc
parent b4181566f9a346461cc445f87c2eb9cab7c49b56
author Tao Bao <tbao@google.com> 1529937857 -0700
committer android-build-merger <android-build-merger@google.com> 1529937857 -0700

Merge "applypatch: {Load,Save}FileContents and ParseSha1 take std::string."
am: b4181566f9

Change-Id: I9fb25b58eaa23443d24c3d6ed75d52ac96c7788f