| commit | 1a9aac5655c8c3297a34b68a4db4a99159f23628 | [log] [tgz] |
|---|---|---|
| author | Pete Gillin <peteg@google.com> | Wed Jan 16 07:34:52 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 16 07:34:52 2019 -0800 |
| tree | 5a70a86cabe1e504349ecac3986849a290617b41 | |
| parent | 25ae61cb2c3af0b614bd38d29a5eb53fddc15df2 [diff] | |
| parent | 15208a3ed772377707324b2b589985403fb11ddd [diff] |
Merge changes from topics "timezone-2018h-i-fix-morocco", "timezone-2018h-i-straight-patch" am: 15208a3ed7 Change-Id: I7ec8d5fe5b8c7633579734979727650439337056
diff --git a/input_data/android/countryzones.txt b/input_data/android/countryzones.txt index f5d8f39..ca74897 100644 --- a/input_data/android/countryzones.txt +++ b/input_data/android/countryzones.txt
@@ -1202,7 +1202,7 @@ countries:< isoCode:"eh" timeZoneMappings:< - utcOffset:"1:00" + utcOffset:"0:00" id:"Africa/El_Aaiun" > > @@ -1944,7 +1944,7 @@ countries:< isoCode:"ma" timeZoneMappings:< - utcOffset:"1:00" + utcOffset:"0:00" id:"Africa/Casablanca" > >
diff --git a/output_data/distro/distro.zip b/output_data/distro/distro.zip index 11b1b0c..399e86f 100644 --- a/output_data/distro/distro.zip +++ b/output_data/distro/distro.zip Binary files differ
diff --git a/output_data/icu_overlay/icu_tzdata.dat b/output_data/icu_overlay/icu_tzdata.dat index adee55c..d63dd36 100644 --- a/output_data/icu_overlay/icu_tzdata.dat +++ b/output_data/icu_overlay/icu_tzdata.dat Binary files differ
diff --git a/testing/data/test1/output_data/distro/distro.zip b/testing/data/test1/output_data/distro/distro.zip index de1aaa2..28d0412 100644 --- a/testing/data/test1/output_data/distro/distro.zip +++ b/testing/data/test1/output_data/distro/distro.zip Binary files differ
diff --git a/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat index 9e40018..b20a9e7 100644 --- a/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat +++ b/testing/data/test1/output_data/icu_overlay/icu_tzdata.dat Binary files differ
diff --git a/testing/data/test2/output_data/distro/distro.zip b/testing/data/test2/output_data/distro/distro.zip index ee9aba6..2b182e6 100644 --- a/testing/data/test2/output_data/distro/distro.zip +++ b/testing/data/test2/output_data/distro/distro.zip Binary files differ
diff --git a/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat b/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat index e233539..8569310 100644 --- a/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat +++ b/testing/data/test2/output_data/icu_overlay/icu_tzdata.dat Binary files differ