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

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

* 0f1fa92e Merge pull request #135 from colincross/deps
* aa873e1c Support deps and depfile properties on build statements

Test: m -j checkbuild
parents ce31b335 0f1fa92e
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