tree 80fdd59466e67924dd5475dbefb404fb24a563e1
parent a296fea692badf7c9dc31163e3ca01f37af42ba1
parent a002abfacf9aeb72ce66d62377f7632ae249519a
author Tao Bao <tbao@google.com> 1512841145 +0000
committer android-build-merger <android-build-merger@google.com> 1512841145 +0000

Merge "applypatch: Remove the 'st' field from FileContents." am: 9203e77e7d am: 710712f235
am: a002abfacf

Change-Id: I3ee175ff08cdcfbb1930039a14bad8d13c336410