tree c8b805ff5e40ad81b108c2d26f34b693283c223b
parent 3d4359d3ae9f25e7b6f366e6308c5c2a5cf15d3e
parent 9203e77e7d449e55e8eb4a112f6896beb408f5ac
author Tao Bao <tbao@google.com> 1512840781 +0000
committer android-build-merger <android-build-merger@google.com> 1512840781 +0000

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

Change-Id: I76e706188be845bb3b58e78501aa0d9cfd748e5a