Commit 617104f8 authored by Nicholas Sauer's avatar Nicholas Sauer Committed by Android Git Automerger
Browse files

am 7dc2ac4a: (-s ours) DO NOT MERGE resolved conflicts for merge of 9651aebc... 

am 7dc2ac4a: (-s ours) DO NOT MERGE resolved conflicts for merge of 9651aebc to klp-modular-dev-plus-aosp

* commit '7dc2ac4a':
  DO NOT MERGE Add ability to include/exclude tests from buildCts.py.
parents f73b21dd 7dc2ac4a
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