OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
912c06f
62c79e9
)
Merge "Implement landscape layout for time picker dialog"
author
Alan Viverette
<alanv@google.com>
Fri, 27 Feb 2015 18:13:52 +0000
(18:13 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 27 Feb 2015 18:13:54 +0000
(18:13 +0000)
1
2
api/current.txt
patch
|
diff1
|
diff2
|
blob
|
history
api/system-current.txt
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/view/View.java
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/widget/DatePickerCalendarDelegate.java
patch
|
diff1
|
diff2
|
blob
|
history
core/res/res/values/attrs.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
api/current.txt
Simple merge
diff --cc
api/system-current.txt
Simple merge
diff --cc
core/java/android/view/View.java
Simple merge
diff --cc
core/java/android/widget/DatePickerCalendarDelegate.java
index
42bc7f2
,
969c073
..
3568522
mode 100755,100644..100755
---
1
/
core/java/android/widget/DatePickerCalendarDelegate.java
---
2
/
core/java/android/widget/DatePickerCalendarDelegate.java
+++ b/
core/java/android/widget/DatePickerCalendarDelegate.java
diff --cc
core/res/res/values/attrs.xml
Simple merge