| commit | 5f75b22317c41c30104db9316a8bc62ce3559b22 | [log] [tgz] |
|---|---|---|
| author | Stuart Scott <stuartscott@google.com> | Thu Feb 20 17:50:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 17:50:10 2014 +0000 |
| tree | 93f5a5616984b1a40bf2cce8fb528862b7d02bcc | |
| parent | 750c587798aea4879592f47274384cade01a8132 [diff] | |
| parent | 7024b3172ad2d22725631592bd984b0cd787713b [diff] |
am 7024b317: am 23a2ce33: am 39eaa6fe: am 13d8e813: am 1734c7f6: resolved conflicts for merge of 995a69d8 to klp-dev * commit '7024b3172ad2d22725631592bd984b0cd787713b': Rewritting Holo tests as hostside tests for speed and stability