Skip to content
Commit 71427aae authored by Colin Cross's avatar Colin Cross
Browse files

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

* aosp/upstream:
  Escape leading space in ninja strings
  Allow BuildParams to override ninja description

Test: builds
parents e36ad10e ea10dedb
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment