tree 426288ab6c08dfbb3398e8de09a10a9bc4aeead2
parent de5c360bc8c03c85d0bd79e636b4f5c0de7943ed
parent 0a32c73326d4c0e5c61a588b9699f7e7a72ab5d7
author Tao Bao <tbao@google.com> 1534789364 -0700
committer android-build-merger <android-build-merger@google.com> 1534789364 -0700

Merge "tests: Remove {old,new}.file." am: 09ce7686f2 am: 14d87881d8
am: 0a32c73326

Change-Id: I2f5a77cca65eb244217ca7b7b37a5d4bf9f3c732