tree 2e9d60ea3e493395559cbfc541151c31b9077c53
parent 0b2f4a18cc1c38d04d2efc7b47762a312d99c987
parent 0c98ce5a08e7ee5343f58fe9afe56c8a9b9fb75e
author Deepanshu Gupta <deepanshu@google.com> 1400003815 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400003815 +0000

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]