tree 312e902430312fe0efea73468fa06bd48e14ed35
parent 008eb6dfd8c0d59a5908eb687fcc435a16f8e3c5
parent 0f72cf540399a4b7fe7890c8b0a9239a4b553605
author Tao Bao <tbao@google.com> 1491237031 +0000
committer android-build-merger <android-build-merger@google.com> 1491237031 +0000

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

Change-Id: Ied3603b0c00832d0b9e8eb90820783b0708ea48d