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

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

* aosp/upstream:
  Add SetDefaultDependencyVariation

Bug: 138103882
Test: m checkbuild
Change-Id: I2c79c3c9e0437fd785b06ca20f43da2963d50b68
parents c23756ff a0b59d9d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment