| commit | e74d437a172e69e0d758b2df055fea55a14009e4 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 18:16:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 18:16:00 2014 +0000 |
| tree | 2e9d60ea3e493395559cbfc541151c31b9077c53 | |
| parent | 81ac665ca522fcfd9135b4c6fde6e3c25791bdc3 [diff] | |
| parent | c5c49dcd5c2fbb4463663d83cfd3eff8e05bba44 [diff] |
am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev * commit 'c5c49dcd5c2fbb4463663d83cfd3eff8e05bba44': Optimize layout rendering in layoutlib [DO NOT MERGE]