Commit 39eaa6fe authored by Stuart Scott's avatar Stuart Scott Committed by Android Git Automerger
Browse files

am 13d8e813: am 1734c7f6: resolved conflicts for merge of 995a69d8 to klp-dev 

* commit '13d8e813':
  Rewritting Holo tests as hostside tests for speed and stability
parents d65dc64c 13d8e813
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