| commit | e2b768665505f90d213e7dd15b91b46fa2a71e20 | [log] [tgz] |
|---|---|---|
| author | Chenjie Luo <cjluo@google.com> | Tue Aug 26 22:18:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 26 22:18:53 2014 +0000 |
| tree | 5a1fcf880a4139214205c32944a65308c6672eb2 | |
| parent | 638c1196f367090011aec3c826cffc9f4f4cb575 [diff] | |
| parent | 3f74ff4df4bf8eb04b76bc88c47e082ce3b3e10c [diff] |
am 3f74ff4d: (-s ours) am 5041b71a: am 14d04b01: am fae2964e: resolved conflicts for merge of fa2b535e to klp-dev * commit '3f74ff4df4bf8eb04b76bc88c47e082ce3b3e10c': 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