OSDN Git Service

am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 17:49:56 +0000 (17:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 17:49:56 +0000 (17:49 +0000)
commit0c98ce5a08e7ee5343f58fe9afe56c8a9b9fb75e
tree3b40011469d381fb81770104918e067cf41bb89f
parent20bec39e3f72d198f06b6b0d4a7ac40f52dc2c0e
parentf75f33d33be9704a09de3de967c24ecb376ca4fb
am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to jb-mr1.1-dev

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