tree 4a2fa097a21a27d70989fd5d9d1621befaa33bf1
parent 32c653b31bd1a6ce54ebbb1b73ce03bde6c92246
parent ae17ffdcf3da3c6743bf8d75be626c02c4ed0414
author Dan Willemsen <dwillemsen@google.com> 1578531818 -0800
committer Dan Willemsen <dwillemsen@google.com> 1578531818 -0800

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

* aosp/upstream:
  Implement "phony_output" feature in ninja

Test: treehugger
Change-Id: Ia22358ec998b1ab2a808038dafb9827d5dd09d2d