tree 2c70230fd22650dfe09e96e01cb25f9cec081df2
parent 2141a760cc6af07c2beb30df940c753d48a70563
parent 839c40513aae03025de0868218e02a130c27dcb7
author Tao Bao <tbao@google.com> 1529938061 -0700
committer android-build-merger <android-build-merger@google.com> 1529938061 -0700

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

Change-Id: Ib729d49068b0ce6ff80941102023b3e2688abe59