| commit | e257cf82bdb9c5c1c35969e1977470fb6fb96837 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Tue May 16 11:11:30 2017 -0700 |
| committer | Colin Cross <ccross@android.com> | Tue May 16 11:11:48 2017 -0700 |
| tree | 388977347058e46ee85c99f8519d81f515ee371e | |
| parent | 71427aae4ec5aa0b36d888cc149afa815ba8bc2d [diff] | |
| parent | d1d60e77072e911cd0bc28b9b8cd3f2a4a5ec668 [diff] |
Merge remote-tracking branch 'aosp/upstream' into master * aosp/upstream: Cap concurrency when parsing blueprint files Test: treehugger Change-Id: I32dcec32e016a8ecc150c388275f35337ecc60c8