OSDN Git Service

am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 18:11:17 +0000 (18:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 18:11:17 +0000 (18:11 +0000)
commitc5c49dcd5c2fbb4463663d83cfd3eff8e05bba44
tree3b40011469d381fb81770104918e067cf41bb89f
parent060836bdf742cc790014cf0f2eaa80b4ace92841
parent8b78a1d7e31355a3ba08e8905e45aefd905ef501
am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev

* commit '8b78a1d7e31355a3ba08e8905e45aefd905ef501':
  Optimize layout rendering in layoutlib [DO NOT MERGE]