Commit 13d8e813 authored by Stuart Scott's avatar Stuart Scott Committed by Android Git Automerger
Browse files

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

* commit '1734c7f6':
  Rewritting Holo tests as hostside tests for speed and stability
parents 50ab028a 1734c7f6
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