Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev
diff --git a/core/java/android/widget/DatePicker.java b/core/java/android/widget/DatePicker.java
index 3e4eb02..5ef7658 100644
--- a/core/java/android/widget/DatePicker.java
+++ b/core/java/android/widget/DatePicker.java
@@ -502,6 +502,11 @@
                 mValidationCallback.onValidationChanged(valid);
             }
         }
+
+        @Override
+        public void dispatchRestoreInstanceState(SparseArray<Parcelable> container) {
+            mDelegator.dispatchThawSelfOnly(container);
+        }
     }
 
     /**