| commit | ef1cdc2521245b6cbc8716df0c65f6bb60c207e7 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu Feb 02 16:54:40 2017 -0800 |
| committer | Colin Cross <ccross@android.com> | Thu Feb 02 16:54:40 2017 -0800 |
| tree | 20db4d2e796137460ac4b815e49c05d171c9cac7 | |
| parent | 3dcbe85b7253aa4a7d6304cddf472fb7095a3f3a [diff] | |
| parent | e8a09f95f675707c3829d686da0ff8765405227c [diff] |
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