OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b53c5b a1191b4)
am a1191b46: am 74503f66: am 0c98ce5a: am f75f33d3: am dd8ebf1e: resolved conflicts...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 18:05:51 +0000 (18:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 18:05:51 +0000 (18:05 +0000)
* commit 'a1191b467d9687cd34e0cec2d4ac827f6020c160':
  Fix DatePicker and Calendar widget in layoutlib. [DO NOT MERGE]


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help