Skip to content
Commit 2a5642ef authored by Colin Cross's avatar Colin Cross
Browse files

Merge remote-tracking branch 'aosp/upstream' into master 

* aosp/upstream:
  Support trailing slash in pathtools.Match patterns

Bug: 111389216
Test: m checkbuild
Change-Id: I3ec96d6da9d6c00c1428a8c064db9b1b60a53edd
parents 80e5939b 46d10707
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment