OSDN Git Service

Merge commit '75dfc87e5e83c04adf876bc7d0d7cab17a31b4d5' into manual_merge_75dfc87
authorAlan Viverette <alanv@google.com>
Wed, 25 May 2016 17:16:08 +0000 (13:16 -0400)
committerAlan Viverette <alanv@google.com>
Wed, 25 May 2016 17:16:08 +0000 (13:16 -0400)
commit7ac0f32c16d4001ec18ba2aba5cfc011d325d524
tree562e1c2aa12fdab3fd6a7a30aa14a8f2f8b38d4a
parenta349f8ce7a50e168e2a0fc3cd7df61f84255b89f
parent75dfc87e5e83c04adf876bc7d0d7cab17a31b4d5
Merge commit '75dfc87e5e83c04adf876bc7d0d7cab17a31b4d5' into manual_merge_75dfc87

Change-Id: Ib55f65f9b00ea6c6515d3e4fc59d86351398b7e1
core/java/android/widget/CalendarView.java
core/java/android/widget/CalendarViewLegacyDelegate.java
core/java/android/widget/CalendarViewMaterialDelegate.java
core/java/android/widget/DayPickerPagerAdapter.java
core/java/android/widget/DayPickerView.java
core/java/android/widget/SimpleMonthView.java