commit | c92379506d057f0bf05ebdf0ec4c7a7b81bf22ef | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Wed Apr 16 19:49:00 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 16 19:49:00 2014 +0000 |
tree | 1de886a057bff8a44a5ea254a6bcb86cb88246d8 | |
parent | 8d966e4243f7729d76f298ad1e06ef40ec4ee40f [diff] | |
parent | 43e229a111147eca7c7fb7a4623d2d04a4df4b43 [diff] |
am 43e229a1: (-s ours) am 38f2b1ea: am 30ab17dd: am 289f1ffb: am 90b0b69c: (-s ours) am 014ac85f: am f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev * commit '43e229a111147eca7c7fb7a4623d2d04a4df4b43': Optimize layout rendering in layoutlib [DO NOT MERGE]