tree 2c70230fd22650dfe09e96e01cb25f9cec081df2
parent b8cb76e380953c08fb03660f4a6d203c081307ac
parent d9f532e7a20e1e2ce967362cd0cf96466caf017a
author Tao Bao <tbao@google.com> 1529938305 -0700
committer android-build-merger <android-build-merger@google.com> 1529938305 -0700

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

Change-Id: I87cf9ea66c3a8a7632650bf8f740a2aa8a959e9c