| commit | f75f33d33be9704a09de3de967c24ecb376ca4fb | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 17:44:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 17:44:40 2014 +0000 |
| tree | 5a64720a796605c91a0d609b59fe6e54fa97c8d9 | |
| parent | f1517cc999cbbac99f7299d06ea4ffc4329b0b9f [diff] | |
| parent | dd8ebf1e15ffa78785307698551357fe80ea3775 [diff] |
am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev * commit 'dd8ebf1e15ffa78785307698551357fe80ea3775': Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]