tree be22baa00360d4918731169d0365a2935bbd615f
parent e21c14594e4e1f879629bb7b945649361ec7ff44
parent 1589d6586b53b75c51fd443a144f4e5a6a71c308
author Colin Cross <ccross@android.com> 1562107468 -0700
committer Colin Cross <ccross@android.com> 1562107494 -0700

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

* aosp/upstream:
  Add MutatorName to mutator contexts
  Make off-the-shelf order funcs public.
  Optimize ninjaString.ValueWithEscaper
  Remove go 1.9 testing
  Put the primary builder into the console pool

Bug: 136473661
Test: m checkbuild
Change-Id: I68c80ebb3466fc4544b73e97ee1d2dd1d73b4c77