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

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

3fc513f9 Merge pull request #120 from colincross/builtin
e0e473ef Add NewBuiltinRule and NewBuiltinPool
parents 61dc5c4e 3fc513f9
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