Commit 4dedb64f authored Nov 03, 2016 by Colin Cross

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

* 09e03f31 Merge pull request #131 from colincross/glob
* 127d2eae Import globbing from Soong

Test: tests/test_tree_tests.sh
Change-Id: Ida941ea1b62f9224f0d520b3b3ae8f310bdbc59e

parents a255dffd 09e03f31

Show whitespace changes

Inline Side-by-side

Please to comment