| commit | 7475771a5bad01cadbdaa7ba0a0833c2262f2933 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 18:41:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 18:41:30 2014 +0000 |
| tree | 1629b381d37037c68755d90861a8b41d13113a58 | |
| parent | 99b33914d7b6ff371397892365685c6e5f56aea9 [diff] | |
| parent | 7be53b2447d973b09a0a13daa8533084be2350f8 [diff] |
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 '7be53b2447d973b09a0a13daa8533084be2350f8': Optimize layout rendering in layoutlib [DO NOT MERGE]