Skip to content
Commit 83cecbe4 authored by Jeff Gaston's avatar Jeff Gaston
Browse files

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

* aosp/upstream:
  Support files named Android.bp in tests

Test: m -j nothing # which runs tests
Change-Id: Id7deda4e08fc276b06a51cbdc0e781ddc75148b3
parents 45c92017 fb52eb9a
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