tree dabd05c105004d1690775c3f4ff104fe63fbc4b5
parent fb512bafecea2e40bc1ec1cf5dd265f8a3779ce7
parent d6ffd7c59f917d2188d0486d8d4d30103c27cc43
author Dan Willemsen <dwillemsen@google.com> 1498246916 -0700
committer Dan Willemsen <dwillemsen@google.com> 1498247404 -0700

Merge remote-tracking branch 'aosp/upstream'

* aosp/upstream:
  Fix glob deps for non-wild patterns

Bug: 62681490
Test: built in tests
Change-Id: If234f02b43a87e5ea63dfda1c163de211d964533