OSDN Git Service

am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 18:05:39 +0000 (18:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 18:05:39 +0000 (18:05 +0000)
commit8b78a1d7e31355a3ba08e8905e45aefd905ef501
tree5a64720a796605c91a0d609b59fe6e54fa97c8d9
parentfed25eb8b316d968154c204271ac0d239afd805e
parent9f00e655db5b2b7c3527c20b60dc816eee6eff1d
am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev

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