| commit | 19dbb00bb1d93f580534572d915df79574180784 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 19:02:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 19:02:52 2014 +0000 |
| tree | db443b073f7e74215a8225ab95d61fa62969da95 | |
| parent | 2c648c6e7e6f11746d6ec97aa53a0818a511c037 [diff] | |
| parent | 79feb7c2d72e3efe9a35bcfcc5eda67c9d4a8d05 [diff] |
am 79feb7c2: am 81f4b8e1: am b806bde9: am 7475771a: am 7be53b24: am a73bc03b: am 471061ce: am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev * commit '79feb7c2d72e3efe9a35bcfcc5eda67c9d4a8d05': Optimize layout rendering in layoutlib [DO NOT MERGE]