am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev

Browse Source

* commit '9f00e655db5b2b7c3527c20b60dc816eee6eff1d':
  Optimize layout rendering in layoutlib [DO NOT MERGE]

...

This commit is contained in:

Deepanshu Gupta

2014-05-13 18:05:39 +00:00

committed by Android Git Automerger

parent fed25eb8b3 9f00e655db

commit 8b78a1d7e3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available