Commit 3f74ff4d authored by Chenjie Luo's avatar Chenjie Luo Committed by Android Git Automerger
Browse files

am 5041b71a: am 14d04b01: am fae2964e: resolved conflicts for merge of fa2b535e to klp-dev 

* commit '5041b71a':
  Create a theme test in cts 1) Move android.host.holo to android.host.theme 2) Migrate other tests from android.holo to android.host.theme 3) Skip theme test for watch and tv
parents 1db00ca6 5041b71a
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