tree 5ec1e8348d605e8df8bf86e55040e7c0beaf66be
parent 3aaf722a8d25ed726d4aba5d96bd325afe74a61c
parent cd3b7aed33c64925b4771e9c6ed160b4e1042c61
author Colin Cross <ccross@android.com> 1519424655 -0800
committer Colin Cross <ccross@android.com> 1519424655 -0800

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

* aosp/upstream:
  Fix format issues found by go vet
  Fix glob cache conflict when excludes=nil and excludes=[]string{}
  Store build.ninja deps in .ninja_deps

Test: m checkbuild
Change-Id: I914f0f1b4b66abdb69d912889907a6f471256176