tree 0468ab26727adacf622415705c10999a86a495cd
parent d9bf6268de2df092444907c6e2fb76655f6d27b4
parent 7d2255db4ec4ecca7ec73b02aaa7a7aa7b16d537
author Dan Willemsen <dwillemsen@google.com> 1538181562 -0700
committer Dan Willemsen <dwillemsen@google.com> 1538181758 +0000

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

* aosp/upstream:
  Add --no_ninja_prelude

Test: prebuilts/build-tools/build-prebuilts.sh
Change-Id: Ic6757068b404ab0002b206c7efa516e2e7e99023