tree 85d85cdb4938feb175c90457b3b297e721c83f56
parent 9c0e0deb8042162b89133ff282210714d0c27732
parent 36cea17013e5497afd40996299cd1c32c6846e38
author Aurimas Liutikas <aurimas@google.com> 1478189698 +0000
committer android-build-merger <android-build-merger@google.com> 1478189698 +0000

Merge "Correct the previous patch for test file subpaths in Checkstyle." am: e958ddb230
am: 36cea17013

Change-Id: I6b125d1780a72bb7e77f17f96bc0eff7e8ce689e