| commit | 07f8da65e231142e6915d9aa7853dd4d772112a0 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 16:31:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 16:31:02 2014 +0000 |
| tree | e43348477d10bfe97d9eb804f26a5461834f6e7a | |
| parent | 0e50f1c2ca92c060e88a645d5607b47db9728ccc [diff] | |
| parent | 888461c801b531f31b2ef34617d333d781d93010 [diff] |
am 888461c8: resolved conflicts for merge of 1103ece2 to jb-mr1.1-dev * commit '888461c801b531f31b2ef34617d333d781d93010': Fix layoutlib [DO NOT MERGE]