tree cef4043d9661ebb911504b5317d9dd19587f63a2
parent f38eda59a87c53c914cd5e68e09d31026674c34c
parent 8a747a086421f6fe2e33a5a86207a6a98190ab49
author Colin Cross <ccross@android.com> 1600882818 -0700
committer Colin Cross <ccross@android.com> 1600882818 -0700

Merge remote-tracking branch 'aosp/upstream'

* aosp/upstream:
  Add Providers to Blueprint

Test: m checkbuild
Change-Id: I4d722c70ce347b16e6258ecd4c3df3adc9d17035