tree 95c4a9523457d2f0b437203e83e5646eac55f471
parent c23756ff58a75fe5d24c7f0e098784e30dcc03d4
parent a0b59d9d29018aa259bd6590cbf8652cd44be265
author Colin Cross <ccross@android.com> 1565380826 -0700
committer Colin Cross <ccross@android.com> 1565380869 -0700

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

* aosp/upstream:
  Add SetDefaultDependencyVariation

Bug: 138103882
Test: m checkbuild
Change-Id: I2c79c3c9e0437fd785b06ca20f43da2963d50b68