| commit | 1922bb9cd156c80ed218300b1a1a55e6022ad92f | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 18:42:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 18:42:31 2014 +0000 |
| tree | db443b073f7e74215a8225ab95d61fa62969da95 | |
| parent | f38000cbd87abb520855c56bbd7118ddbe35a003 [diff] | |
| parent | 84f5beed2a4564b53b246f418f7d9ae55fccf760 [diff] |
am 84f5beed: am f2650430: am 403cc2f9: am b1cf6a87: am a7ed116d: am 5dce0a4b: am a1191b46: am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev * commit '84f5beed2a4564b53b246f418f7d9ae55fccf760': Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]