OSDN Git Service

am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts for merge of 520f585b to...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 17:56:55 +0000 (17:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 17:56:55 +0000 (17:56 +0000)
commit74503f66e0cb5a4ea617c4a66882e8c33e5cc888
tree2e9d60ea3e493395559cbfc541151c31b9077c53
parent0b2f4a18cc1c38d04d2efc7b47762a312d99c987
parent0c98ce5a08e7ee5343f58fe9afe56c8a9b9fb75e
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]