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

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

* aosp/upstream:
  Fix recursive glob on MockFs

Test: glob_test.go
Change-Id: I5e8a69811755fee399f1d417c17f407a51e79896
parents ac45bd1e afa12b47
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment