Skip to content
Commit 2df4276e authored by Colin Cross's avatar Colin Cross
Browse files

Merge remote-tracking branch 'aosp/upstream' master 

* aosp/upstream:
  Allow multiple dependencies on the same module

Test: m checkbuild
Change-Id: I75947f1e8be7921a9a6dc9c9ae80aa279f906b75
parents 19f04d99 cd0310f2
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment