| commit | 7024b3172ad2d22725631592bd984b0cd787713b | [log] [tgz] |
|---|---|---|
| author | Stuart Scott <stuartscott@google.com> | Thu Feb 20 01:59:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 01:59:07 2014 +0000 |
| tree | b60ae5a39efd1309e0e97cb8711817a3c8181a91 | |
| parent | 7ceee8de4c89eedce95a2244bc210df9b1756117 [diff] | |
| parent | 23a2ce339dd5832d17f47b9d664b322e16c162a7 [diff] |
am 23a2ce33: am 39eaa6fe: am 13d8e813: am 1734c7f6: resolved conflicts for merge of 995a69d8 to klp-dev * commit '23a2ce339dd5832d17f47b9d664b322e16c162a7': Rewritting Holo tests as hostside tests for speed and stability