tree b1bec8ecc80e846fed1d68973154c19c6a7aa8ae
parent 1c4364276d9bbc4923ab89c4bd1218e3135b83f5
parent 9492c29702eac3112871d42c6978ccbe9c895d66
author Colin Cross <ccross@android.com> 1607986321 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607986321 +0000

Merge remote-tracking branch 'aosp/upstream' am: 52176e9851 am: 9492c29702

Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1527662

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8f454d33ec6def0f7f13ab4866be05ed73cf0a7