aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-01-22Merge branch aosp/cldr-release-38 into aosp/master am: 57dedf17a1 am: ↵Victor Chang
6f67308797 am: 353e66c104 Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1556182 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I970c97bdcfa58b7a5150c4fa8410d897274611ab
2021-01-22Update the version in METADATA to 38.1 am: 5b23caf69c am: 77b4ca6e93Victor Chang
Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1556185 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8ed5a3e05c289d489891c318dbd52a5a6e5aa2cd
2021-01-22Remove incorrect duplicated Asia/Qostanay entry in common/main/en.xml am: ↵Victor Chang
a44a5e7eb6 am: 2b101ae21a Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1556184 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5ddb8e3c7a5dcfb830258f1170084bfde1325284
2021-01-22Android patch: cldrbug 2698: Re-apply switching 'no' and 'nb' am: fe1abfd2c2 ↵Victor Chang
am: e6e0d576b0 Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1556183 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibdef7aa2810aace5d7b0fc0132796b8d5cdc4710
2021-01-22Merge branch aosp/cldr-release-38 into aosp/master am: 57dedf17a1 am: 6f67308797Victor Chang
Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1556182 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If8f6f13b9825407b41f18d60b4d5e6ed3029d1b9
2021-01-22Update the version in METADATA to 38.1 am: 5b23caf69cVictor Chang
Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1556185 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4c568c5a0d969f010abe3be59be217c6ab53196b
2021-01-22Remove incorrect duplicated Asia/Qostanay entry in common/main/en.xml am: ↵Victor Chang
a44a5e7eb6 Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1556184 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8e837c62dec107303cdc279cd78f52150c594a01
2021-01-22Android patch: cldrbug 2698: Re-apply switching 'no' and 'nb' am: fe1abfd2c2Victor Chang
Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1556183 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia0099717ecd5ddb0d081b2ee6cfbf283e0bc36f9
2021-01-22Merge branch aosp/cldr-release-38 into aosp/master am: 57dedf17a1Victor Chang
Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1556182 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia9728866527e0ae6145cda7bbb869324922daaf9
2021-01-21Update the version in METADATA to 38.1Victor Chang
Bug: 160356314 Test: n/a Change-Id: I4ed91db042aaa98fc1f74d18442d32903a42d801
2021-01-21Remove incorrect duplicated Asia/Qostanay entry in common/main/en.xmlVictor Chang
The entry is duplicated on line 3265 and 3281. It was a merge error in CLDR 35 https://android-review.googlesource.com/c/platform/external/cldr/+/1090741/-2..1/common/main/en.xml#3245 given the master branch has a cherry-pick of 2018i already, https://r.android.com/871975 The error is found when manually reviewing the diff from the upstream Test: external/icu/tools/updatecldrdata.py Change-Id: I262eb5d9ee4143e6f0b7a90054d72f3aa1590663
2021-01-21Android patch: cldrbug 2698: Re-apply switching 'no' and 'nb'Victor Chang
This is a temporary workaround until the issue has been fixed upstream: https://unicode.org/cldr/trac/ticket/2698 This change was introduced in Android by the ICU51.1 upgrade: https://android.googlesource.com/platform/external/icu/+/8393335 The change was splited into external/cldr project since CLDR 32: https://android.googlesource.com/platform/external/cldr/+/ac897f0f8685521e466e53b0ed9eeb437a6f230a https://r.android.com/692424 In CLDR 38.1, the patch in languageInfo.xml is migrated to "written_new" type because the old "written" type is removed. See details in https://unicode-org.atlassian.net/browse/CLDR-13245 Test: CtsIcuTestCases Test: CtsIcu4cTestCases Change-Id: I0cd44b6fd00b1da0a90effeb946655b9e3154c12
2021-01-21Merge branch aosp/cldr-release-38 into aosp/masterVictor Chang
Bug: 160356314 Test: external/icu/tools/updatecldrdata.py Change-Id: Iea3dccc6a2cf2be041fba231c8e7dbdd7c217290
2021-01-18Copy upstream release-38-1cldr-release-38Victor Chang
Change-Id: I826e6439fc0edd14c213603a7c692d5183f49a79
2021-01-18Merge changes from topic "tzdb2020f_mainline-prod"Almaz Mingaleev
* changes: [automerged blank] DO NOT MERGE Cherry-pick CLDR-14373: Update Android CLDR tzdata from 2020d to 2020f. [R] 2p: a4b14d0fe7 DO NOT MERGE Cherry-pick CLDR-14373: Update Android CLDR tzdata from 2020d to 2020f. [R]
2021-01-15Update CLDR version to 37 in the METADATA am: c278088a51 am: bbb0c8d370 am: ↵Victor Chang
dff090cd7c Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1550036 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib0d0458b8210c8b062bd475a9a39c9d28a1a457c
2021-01-15Revert Android patches in deprecated dataModifiers.txt am: cad2d19553 am: ↵Victor Chang
05ddbabc1f am: 2fcc6b4df7 Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1548115 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia978a36abd51cf10f12e1fa590f12a5ca6767c56
2021-01-15Merge branch 'release-37' into aosp/master am: 3eaca5ff43 am: 8070213a75 am: ↵Victor Chang
34eb89e92c Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1548114 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic795af664cc4fd7d27070e8268d06dfa26196f19
2021-01-15Update CLDR version to 37 in the METADATA am: c278088a51 am: bbb0c8d370Victor Chang
Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1550036 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8353fede2c66151d71124e5210bfacd7d101e049
2021-01-15Revert Android patches in deprecated dataModifiers.txt am: cad2d19553 am: ↵Victor Chang
05ddbabc1f Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1548115 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icff1845a31c4a93338e1bf855246621a5c559ffb
2021-01-15Merge branch 'release-37' into aosp/master am: 3eaca5ff43 am: 8070213a75Victor Chang
Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1548114 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I453328db8d73218b37231b7131ef4ff9f322af61
2021-01-15Update CLDR version to 37 in the METADATA am: c278088a51Victor Chang
Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1550036 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I033bd5a0e39b298402b24e549e662081693eb139
2021-01-15Revert Android patches in deprecated dataModifiers.txt am: cad2d19553Victor Chang
Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1548115 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7c741bed75f19fed513f1073268c6437b00c7f9c
2021-01-15Merge branch 'release-37' into aosp/master am: 3eaca5ff43Victor Chang
Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1548114 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I715f92329f21c2ba7c190a11d167286399a334a7
2021-01-14DO NOT MERGE Add new Windows time zone for Yukon Standard time. [R]Almaz Mingaleev
Cherry-pick https://github.com/unicode-org/cldr/commit/042bdd299d38cc33d361726eb1af08294719d4f6. This CL also updates typeVersion in windowsZones.xml from 2019f to 2020d. Changes up to CLDR-14301(cherry-picked) were already applied to this file, but version was left untouched as https://github.com/unicode-org/cldr/commit/84cef63701b74ffe6153af9c2e621da2aaf08d80#diff-213eaf1f51bc8d033428f97392cdef116637e514d4a69b137e064363e935fcdb was not applied. ./external/icu/updatecldrdata.py changed only icu4c/source/data/misc/windowsZones.txt. Bug: 174544566 Test: None Merged-In: I913fd73dcc8f8e33f502213a5c29bf6c6ad61cb0 Change-Id: I913fd73dcc8f8e33f502213a5c29bf6c6ad61cb0
2021-01-14[automerged blank] DO NOT MERGE Cherry-pick CLDR-14373: Update Android CLDR ↵Almaz Mingaleev
tzdata from 2020d to 2020f. [R] 2p: a4b14d0fe7 Blank merge reason: commit message contains skip directive Original change: undetermined Change-Id: I2470eecfe53a07f2d8b51eb70c0884c28dd1a7b5
2021-01-14DO NOT MERGE Cherry-pick CLDR-14373: Update Android CLDR tzdata fromAlmaz Mingaleev
2020d to 2020f. [R] Cherry-pick CLDR-14373: Update Android CLDR tzdata from 2020d to 2020f. [R] Cherry-pick of https://github.com/unicode-org/cldr/commit/d909e3deed3a68c217d1c19390df959c85f365fd. Bug: 177201403 Test: CtsLibcoreTestCases Test: CtsLibcoreOjTestCases Test: CtsIcuTestCases Test: CtsBionicTestCases Test: CtsTextTestCases Merged-In: I0a9f69a038421e1719a30efbec826753303a9b6b Change-Id: I0a9f69a038421e1719a30efbec826753303a9b6b
2021-01-13Update CLDR version to 37 in the METADATAVictor Chang
Bug: 160356314 Test: n/a Change-Id: I574772c3e15b5af8327e79fc965447f2e0a9a55c
2021-01-13[automerged blank] DO NOT MERGE Add new Windows time zone for Yukon Standard ↵Almaz Mingaleev
time. [R] 2p: b3d8f0443a Blank merge reason: commit message contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cldr/+/13326325 Change-Id: If12c9c8885eafa5934f3072f7a72796cb7c4c1c7
2021-01-12DO NOT MERGE Add new Windows time zone for Yukon Standard time. [R]Almaz Mingaleev
Cherry-pick https://github.com/unicode-org/cldr/commit/042bdd299d38cc33d361726eb1af08294719d4f6. This CL also updates typeVersion in windowsZones.xml from 2019f to 2020d. Changes up to CLDR-14301(cherry-picked) were already applied to this file, but version was left untouched as https://github.com/unicode-org/cldr/commit/84cef63701b74ffe6153af9c2e621da2aaf08d80#diff-213eaf1f51bc8d033428f97392cdef116637e514d4a69b137e064363e935fcdb was not applied. ./external/icu/updatecldrdata.py changed only icu4c/source/data/misc/windowsZones.txt. Bug: 177201403 Test: None Merged-In: I913fd73dcc8f8e33f502213a5c29bf6c6ad61cb0 Change-Id: I913fd73dcc8f8e33f502213a5c29bf6c6ad61cb0
2021-01-12Revert Android patches in deprecated dataModifiers.txtVictor Chang
They are replaced by a patch in external/icu/tools/cldr/cldr-to-icu/build-icu-data.xml due to a tool migration from CLDR to ICU in the upstream. https://r.android.com/1540735 This change is for ICU 67 upgrade. Bug: 8264703 Bug: 21295835 Bug: 36123938 Test: no change after ./updatecldrdata.py Change-Id: I2eead645ece31266236d89458ae7cc4baa956d64
2021-01-12Merge branch 'release-37' into aosp/masterVictor Chang
Test: ./updatecldrdata.py Change-Id: I5301aaa05fe04551610677a4bd5b3eadef75bce9
2021-01-12Copy upstream release-37cldr-release-37Victor Chang
Copy the files with the following commands: git --git-dir=${UPSTREAM_CLDR_GIT}/.git --work-tree=${UPSTREAM_CLDR_GIT} checkout release-37 rm -rf * cp -r ${UPSTREAM_CLDR_GIT}/* . git clean -dfX Test: n/a Change-Id: Ic554fabcd1771700827ae83bd312b5573e34e349
2021-01-08Cherry-pick CLDR-14373: Update Android CLDR tzdata am: 2e87f9f14c am: ↵Almaz Mingaleev
c0a41e9960 am: 6ef19a86ea Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1543047 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie5234e8015ac601ce1020c83f0ead83df519b3fe
2021-01-08Cherry-pick CLDR-14373: Update Android CLDR tzdata am: 2e87f9f14c am: c0a41e9960Almaz Mingaleev
Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1543047 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3d2caea7dce9d2cb6f6fb7c99490061fb940afb6
2021-01-08Cherry-pick CLDR-14373: Update Android CLDR tzdata am: 2e87f9f14cAlmaz Mingaleev
Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1543047 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id6e052c1e097f98afbe806e943782acbbd37dc37
2021-01-08Cherry-pick CLDR-14373: Update Android CLDR tzdataAlmaz Mingaleev
from 2020d to 2020f. Cherry-pick of https://github.com/unicode-org/cldr/commit/d909e3deed3a68c217d1c19390df959c85f365fd. Bug: 174544566 Test: CtsLibcoreTestCases Test: CtsLibcoreOjTestCases Test: CtsIcuTestCases Test: CtsBionicTestCases Test: CtsTextTestCases Change-Id: Ib5f171278e8e9ff51f00b5e54a297781796418a4
2021-01-07Add new Windows time zone for Yukon Standard time. am: fb156c7a0c am: ↵Almaz Mingaleev
4fee3d3379 am: 68c3fe0e55 Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1541536 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id624e7e69685635bd245d33dda6ce32081db21a4
2021-01-07Add new Windows time zone for Yukon Standard time. am: fb156c7a0c am: 4fee3d3379Almaz Mingaleev
Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1541536 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie2d4d412de5cf0b28b51ecf02c4d12e3f165731f
2021-01-07Add new Windows time zone for Yukon Standard time. am: fb156c7a0cAlmaz Mingaleev
Original change: https://android-review.googlesource.com/c/platform/external/cldr/+/1541536 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I94da23ffce8862939089ace85b7fa517a930a252
2021-01-07Add new Windows time zone for Yukon Standard time.Almaz Mingaleev
Cherry-pick https://github.com/unicode-org/cldr/commit/042bdd299d38cc33d361726eb1af08294719d4f6. This CL also updates typeVersion in windowsZones.xml from 2019f to 2020d. Changes up to CLDR-14301(cherry-picked) were already applied to this file, but version was left untouched as https://github.com/unicode-org/cldr/commit/84cef63701b74ffe6153af9c2e621da2aaf08d80#diff-213eaf1f51bc8d033428f97392cdef116637e514d4a69b137e064363e935fcdb was not applied. ./external/icu/updatecldrdata.py changed only icu4c/source/data/misc/windowsZones.txt. Bug: 174544566 Test: None Change-Id: I913fd73dcc8f8e33f502213a5c29bf6c6ad61cb0
2020-11-24Mark ab/6881855 as merged am: 1217fc9d64 am: a55db87650Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cldr/+/13112497 Change-Id: Iaab5c759fde43ff511a839b499b0ccd6fbd3ea0e
2020-11-24Mark ab/6881855 as merged am: 1217fc9d64Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cldr/+/13112497 Change-Id: I1f8c0af971905dc6346f9eb0ab25024d50a718ff
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Iec657adb9054960beaa63615a917ae246137fb34
2020-11-06[automerger skipped] RESTRICT AUTOMERGE CLDR-14225 tz database 2020b updates ↵Neil Fuller
[R] am: 74d3c14d58 am: 7a931b22a8 am: 491b1159ea -s ours am: 880c79da10 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cldr/+/12977400 Change-Id: Ida98c4557c9abd526ce458b39a502f43c8998bcf
2020-11-06[automerger skipped] RESTRICT AUTOMERGE CLDR-13739 Changed some tzdata files ↵Neil Fuller
to rear-guard version. (#445) am: f983e8835f am: e3e2ea4f77 am: eb4b58f772 -s ours am: 202f04d912 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cldr/+/12977399 Change-Id: I054c0ed525f7390553dbe44469e95fabe57b521b
2020-11-06[automerger skipped] RESTRICT AUTOMERGE CLDR-14225 tz database 2020b updates ↵Neil Fuller
[R] am: 74d3c14d58 am: 7a931b22a8 -s ours am: 59251de498 -s ours am: a45652af35 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cldr/+/12977400 Change-Id: I7c406d2bb6f6a0b823e57abf2293106bee2be079
2020-11-06[automerger skipped] RESTRICT AUTOMERGE CLDR-13739 Changed some tzdata files ↵Neil Fuller
to rear-guard version. (#445) am: f983e8835f am: e3e2ea4f77 -s ours am: 0694114e6f -s ours am: 6f26d64fce -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cldr/+/12977399 Change-Id: I6411297c98a7598108943c0906b2e5a3b642659c
2020-11-06[automerger skipped] RESTRICT AUTOMERGE CLDR-14225 tz database 2020b updates ↵Neil Fuller
[R] am: 74d3c14d58 am: 7a931b22a8 am: 491b1159ea -s ours am skip reason: Change-Id I6f0436daccc28de2cfb0c5086ca6e5d9e3150fbb with SHA-1 74d3c14d58 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cldr/+/12977400 Change-Id: I2a3d9b5956e31a943c2963413bf04e7ddc813de2
2020-11-06[automerger skipped] RESTRICT AUTOMERGE CLDR-13739 Changed some tzdata files ↵Neil Fuller
to rear-guard version. (#445) am: f983e8835f am: e3e2ea4f77 am: eb4b58f772 -s ours am skip reason: Change-Id I2477e5c28cf2d6d1e11989bcbb85fa07aab9cd67 with SHA-1 10c502968c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/cldr/+/12977399 Change-Id: I45d37bdb30250a86ee12d4a5510cca91089bd351
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 21:05:18 +0000