tree 660155d155e075109b5d7f6dd0c96e532805ca88
parent 477925316b044af307a791bb148f8751ae930df1
parent 7501f6096cd2217a12aa0c05a548d4c04d0552fd
author Jeff Gaston <jeffrygaston@google.com> 1498609745 +0000
committer android-build-merger <android-build-merger@google.com> 1498609745 +0000

Merge "Revert "Move WildcardMatcher into new 'matcher' package"" am: b1b164ac86 am: 9ef5ef62ba am: 626019de32
am: 7501f6096c

Change-Id: I848da9940449f2eff0d3d137465a92e54915f87e