Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 904d911f authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am e88ae544: am b6f0cbdc: merge from open-source master

parents cee6300c e88ae544
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -500,7 +500,10 @@ public class Address implements Parcelable {
            a.mAdminArea = in.readString();
            a.mSubAdminArea = in.readString();
            a.mLocality = in.readString();
            a.mSubLocality = in.readString();
            a.mThoroughfare = in.readString();
            a.mSubThoroughfare = in.readString();
            a.mPremises = in.readString();
            a.mPostalCode = in.readString();
            a.mCountryCode = in.readString();
            a.mCountryName = in.readString();
@@ -544,7 +547,10 @@ public class Address implements Parcelable {
        parcel.writeString(mAdminArea);
        parcel.writeString(mSubAdminArea);
        parcel.writeString(mLocality);
        parcel.writeString(mSubLocality);
        parcel.writeString(mThoroughfare);
        parcel.writeString(mSubThoroughfare);
        parcel.writeString(mPremises);
        parcel.writeString(mPostalCode);
        parcel.writeString(mCountryCode);
        parcel.writeString(mCountryName);