| commit | 74503f66e0cb5a4ea617c4a66882e8c33e5cc888 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 17:56:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 17:56:55 2014 +0000 |
| tree | 2e9d60ea3e493395559cbfc541151c31b9077c53 | |
| parent | 0b2f4a18cc1c38d04d2efc7b47762a312d99c987 [diff] | |
| parent | 0c98ce5a08e7ee5343f58fe9afe56c8a9b9fb75e [diff] |
am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev * commit '0c98ce5a08e7ee5343f58fe9afe56c8a9b9fb75e': Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]