| commit | 8b78a1d7e31355a3ba08e8905e45aefd905ef501 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 18:05:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 18:05:39 2014 +0000 |
| tree | 5a64720a796605c91a0d609b59fe6e54fa97c8d9 | |
| parent | fed25eb8b316d968154c204271ac0d239afd805e [diff] | |
| parent | 9f00e655db5b2b7c3527c20b60dc816eee6eff1d [diff] |
am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev * commit '9f00e655db5b2b7c3527c20b60dc816eee6eff1d': Optimize layout rendering in layoutlib [DO NOT MERGE]