tree 5f20567e1627e96ef1a059f26ab9bd2dbf906d2a
parent 3dcc24490b09eb1fab9605919a9b898c034552f9
parent 22b1fa7d61ad83adb9506d5bab3ab5cd2ab32e88
author Tao Bao <tbao@google.com> 1493226165 +0000
committer android-build-merger <android-build-merger@google.com> 1493226165 +0000

Merge "applypatch: Remove the obsolete support for "applypatch -s"." am: d5ae4253c1
am: 22b1fa7d61

Change-Id: I16a55f996e66e46359d315508c1ea48e22f4c67f