tree 20db4d2e796137460ac4b815e49c05d171c9cac7
parent 3dcbe85b7253aa4a7d6304cddf472fb7095a3f3a
parent e8a09f95f675707c3829d686da0ff8765405227c
author Colin Cross <ccross@android.com> 1486083280 -0800
committer Colin Cross <ccross@android.com> 1486083280 -0800

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

*   e8a09f9 Merge pull request #141 from colincross/fs
|\
| * b519a7e Add globbing to filesystem mocking
|/
* 2eeb7ee Merge pull request #140 from danw/sort_tests
* 61caa24 Sort testcases to make build (more) reproducible

Test: soong tests