OSDN Git Service

am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 16:36:38 +0000 (16:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 16:36:38 +0000 (16:36 +0000)
commit40b54563743c3bab92ee7086f8a2b159ecef5453
treec6218a0e68eba7dc5b75343e076e83b510610f1b
parenta7c0d02ad6b161b5084abc8a2740f7e783d4ad1e
parent07f8da65e231142e6915d9aa7853dd4d772112a0
am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev

* commit '07f8da65e231142e6915d9aa7853dd4d772112a0':
  Fix layoutlib [DO NOT MERGE]