tree 26c2232f8dbd11357a7167e5056f2b611d324a80
parent 5ef2a1eeaac689e76d4d6f7ec435065ed5c7f103
parent 2a062a2ef03631110e29b9c415aa30e81a4c5614
author Dan Willemsen <dwillemsen@google.com> 1587334802 -0700
committer Dan Willemsen <dwillemsen@google.com> 1587334802 -0700

Merge remote-tracking branch 'aosp/upstream'

* aosp/upstream:
  Actually write an empty ninja file with --empty-ninja-file

Test: treehugger (build_test)
Change-Id: Iff7851f2aa39eb14b7ae72ed6ce94fa0ce8d2621