tree dabd05c105004d1690775c3f4ff104fe63fbc4b5
parent 3680943aef06aa243702b355ae3f94d6dfab5134
parent be73e44034bb13874655be44c24f6411d27081b5
author Colin Cross <ccross@android.com> 1498510580 -0700
committer Colin Cross <ccross@android.com> 1498511714 -0700

Merge remote-tracking branch 'goog/master' into oc-dr1-dev

* goog/master:
  Fix glob deps for non-wild patterns
  Add OWNERS in build/blueprint
  Some util functions to support bpfix

Bug: 62681490
Test: builds
Change-Id: Iad885e2990d54f4e29282d456a0ab91425506e82
Merged-In: If234f02b43a87e5ea63dfda1c163de211d964533