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

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

* aosp/upstream:
  Cap concurrency when parsing blueprint files

Test: treehugger
Change-Id: I32dcec32e016a8ecc150c388275f35337ecc60c8
parents 71427aae d1d60e77
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