Skip to content
Commit 6c5a2f72 authored by Colin Cross's avatar Colin Cross
Browse files

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

* aosp/upstream:
  Move outputs of bootstrap modules in main stage to separate directory

Test: m checkbuild
Change-Id: I19de5b4acc6c4422fdc5177971de5bf6a755259a
parents d2a5c6d5 7e8c766a
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