tree 1b41faf0f968dedd8408c7dd5d08c379a7e1990e
parent ce5e980835aefc5d00bd22b07d786b43aedb4211
parent 7ee4b7dd8442ca51d9aaa8189a01fd3b470f32fd
author Tao Bao <tbao@google.com> 1493226464 +0000
committer android-build-merger <android-build-merger@google.com> 1493226464 +0000

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

Change-Id: I9f372c9b371f28b70ec6832e66053d3aee5b7c8e