tree a3831ad4f21e7ee5dc125ce937b4193e2e29223b
parent db06ccbfa9d2c9470531b96f35201fdf1d5f0256
parent 148f9f316ee6f9c4a0af225912c1c7a5ab31b03e
author Colin Cross <ccross@android.com> 1523406846 -0700
committer Colin Cross <ccross@android.com> 1523406896 -0700

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

* aosp/upstream:
  Add proptools.BoolDefault and proptools.StringDefault
  Reduce maximum goroutine count
  Add Patch and PatchList for making textual changes
  Make End() return the position after the node

Test: m checkbuild
Change-Id: I70b44507135ed0c36458db0d4630402b6e8990bd