am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev

Browse Source

* commit 'f75f33d33be9704a09de3de967c24ecb376ca4fb':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]

...

This commit is contained in:

Deepanshu Gupta

2014-05-13 17:49:56 +00:00

committed by Android Git Automerger

parent 20bec39e3f f75f33d33b

commit 0c98ce5a08

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available