| commit | 84f5beed2a4564b53b246f418f7d9ae55fccf760 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 18:36:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 18:36:04 2014 +0000 |
| tree | d24eb93b4db64ef97840ac995cc82afc0286b4e0 | |
| parent | 024c45876c110a72e64c2c57e0d5688c11715479 [diff] | |
| parent | f26504308af3f63f8732cfc1c738456d046486ca [diff] |
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 'f26504308af3f63f8732cfc1c738456d046486ca': Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]