Merge "Fix crash when restoring SearchView." into nyc-dev

core/java/android/widget/SearchView.java

@@ -1358,6 +1358,17 @@ public class SearchView extends LinearLayout implements CollapsibleActionView {
                     + Integer.toHexString(System.identityHashCode(this))
                     + " isIconified=" + isIconified + "}";
         }
+
+        public static final Parcelable.Creator<SavedState> CREATOR =
+                new Parcelable.Creator<SavedState>() {
+                    public SavedState createFromParcel(Parcel in) {
+                        return new SavedState(in);
+                    }
+
+                    public SavedState[] newArray(int size) {
+                        return new SavedState[size];
+                    }
+                };
     }
 
     @Override