tree 22e2bee6e2b0f30bd1bf10a95d50452e1686045b
parent d6d76f814ed3bbfaf6681289d5e5763de7e427fc
parent 876099e5e7305332b0eed7f5bf64927b21905766
author Colin Cross <ccross@android.com> 1563566718 -0700
committer Colin Cross <ccross@android.com> 1563566753 -0700

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

* aosp/upstream:
  Revert "Put the primary builder into the console pool"
  Fix/improve comments on prepending/appending props

Fixes: 137593206
Test: m checkbuild
Change-Id: Ibed0bfa25cc26fd4382772e93ae6ddf07ab3d9fc