OSDN Git Service

am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 18:21:01 +0000 (18:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 18:21:01 +0000 (18:21 +0000)
commit471061ce3dc4133549263bde3bd5e661b69f17fc
tree80a3b4c13ba476ff76c868ae4d709c3280b7422d
parent2f8da100eff9245c37042c962af39d21d27c06b1
parente74d437a172e69e0d758b2df055fea55a14009e4
am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge of ce9e87f7 to jb-mr1.1-dev

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