Commit 6f7fb360 authored by Christopher Ferris's avatar Christopher Ferris Committed by Android Git Automerger
Browse files

am 0ca3539e: resolved conflicts for merge of 8b9d3077 to klp-dev-plus-aosp 

* commit '0ca3539e':
  Native tests use a text file based test list.
parents 888d6a24 0ca3539e
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