| commit | 5041b71aa56585fae8b116686a7e8c889b1245eb | [log] [tgz] |
|---|---|---|
| author | Chenjie Luo <cjluo@google.com> | Sat Aug 23 04:47:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 23 04:47:49 2014 +0000 |
| tree | 0130b212fa04bc64fe683ba6780fbce77a358bd3 | |
| parent | e4cdf1f7ea0638368745923a119c36cf1ca38c3d [diff] | |
| parent | 14d04b0189ab19475b84383d93003e93b6bd1731 [diff] |
am 14d04b01: am fae2964e: resolved conflicts for merge of fa2b535e to klp-dev * commit '14d04b0189ab19475b84383d93003e93b6bd1731': 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