commit | 9eb0cd12742bdd6098932eedfd33a0b14f2196c9 | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Thu Oct 02 08:50:34 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 02 08:50:34 2014 +0000 |
tree | baebddb5d6824ad36e966f36c244b0a75b70bce4 | |
parent | 82eecaf826ab06c4f3cb0716a009ff0c8ae00711 [diff] | |
parent | d332ff3e3f647b9514ecff1f146464fbc1a93372 [diff] |
am d332ff3e: (-s ours) am bae64421: Merge "Add testing framework to LayoutLib. [DO NOT MERGE]" into klp-modular-dev * commit 'd332ff3e3f647b9514ecff1f146464fbc1a93372': Add testing framework to LayoutLib. [DO NOT MERGE]