| commit | 71412900b724fd194d9eed2457aeaa12f7226df0 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Thu Oct 02 09:30:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 02 09:30:04 2014 +0000 |
| tree | 4e163618c234e61d5b5252064659766a87f67037 | |
| parent | 19fe9f1bf51521a58097374c1af336fec6548ea0 [diff] | |
| parent | 9eb0cd12742bdd6098932eedfd33a0b14f2196c9 [diff] |
am 9eb0cd12: am d332ff3e: (-s ours) am bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev * commit '9eb0cd12742bdd6098932eedfd33a0b14f2196c9': Add testing framework to LayoutLib. [DO NOT MERGE]