tree 6cbd663fd2d46a879605ecb97191816f0df09dd6
parent 95588b8ff24659ce12b19241a903600f277e2262
parent 4ad9995b5bef8fcf3d8d6c70c742e3648d244aac
author Tao Bao <tbao@google.com> 1532146657 -0700
committer android-build-merger <android-build-merger@google.com> 1532146657 -0700

Merge "applypatch: Change applypatch command-line arguments." am: 860b457a15 am: 7d2962b942
am: 4ad9995b5b

Change-Id: I6a95f04ce99e8e53b749f7873ddf056e3d9dff3f