Merge "Small cleanup in DeviceProductInfo."

 * @hide

 */

public final class DeviceProductInfo implements Parcelable {

    final private String mName;

    final private String mManufacturerPnpId;

    final private String mProductId;

    final private Integer mModelYear;

    final private ManufactureDate mManufactureDate;

    private final String mName;

    private final String mManufacturerPnpId;

    private final String mProductId;

    private final Integer mModelYear;

    private final ManufactureDate mManufactureDate;

    public DeviceProductInfo(

            String name,

            String manufacturerPnpId,

            String productCode,

            String productId,

            Integer modelYear,

            ManufactureDate manufactureDate) {

        this.mName = name;

        this.mManufacturerPnpId = manufacturerPnpId;

        this.mProductId = productCode;

        this.mProductId = productId;

        this.mModelYear = modelYear;

        this.mManufactureDate = manufactureDate;

    }

     * @hide

     */

    public static class ManufactureDate implements Parcelable {

        final private Integer mWeek;

        final private Integer mYear;

        private final Integer mWeek;

        private final Integer mYear;

        public ManufactureDate(Integer week, Integer year) {

            mWeek = week;