Merge "Implement landscape layout for time picker dialog"

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