tree 6dabd02c6df67e167284148142eb719c9440163f
parent 1b2752cb01afded1a2c14848f623d015c59f9aef
parent f69d320862d660a64e7a2ebb08e3e144805c7f4b
author Tao Bao <tbao@google.com> 1491237242 +0000
committer android-build-merger <android-build-merger@google.com> 1491237242 +0000

Merge "applypatch: Remove duplicate test files." am: b6609f8895 am: 1f38a9b96e am: 0f72cf5403
am: f69d320862

Change-Id: If80eb66a1410f8d8b8ac25d4e9263f6bda32df1f