OSDN Git Service

am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 16:31:02 +0000 (16:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 16:31:02 +0000 (16:31 +0000)
commit07f8da65e231142e6915d9aa7853dd4d772112a0
treee43348477d10bfe97d9eb804f26a5461834f6e7a
parent0e50f1c2ca92c060e88a645d5607b47db9728ccc
parent888461c801b531f31b2ef34617d333d781d93010
am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev

* commit '888461c801b531f31b2ef34617d333d781d93010':
  Fix layoutlib [DO NOT MERGE]