summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-03-25Snap for 8358640 from 498c5148458a63598417d2b2369fbed3ab19331c to ↵aml_go_ips_330911000android13-mainline-go-ipsec-releaseAndroid Build Coastguard Worker
mainline-go-ipsec-release Change-Id: I240b2879ceb86f66dbd9b255720b9ed427b8a8c1
2022-03-23Snap for 8347268 from 7802874536082218e4e98284f915e3e3ed273216 to ↵Android Build Coastguard Worker
mainline-go-ipsec-release Change-Id: Ic4d50aff2d3930eb2af0e6173fa3c0965838552b
2021-09-10Change OWNERS am: 89858ea648 am: d5bf5e0f21 am: c903944061 am: 8b7119edf1 ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Neil Fuller
am: 4ccdfc0e80 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1824112 Change-Id: I59777ee96fb29926365c795818612b5a4fa92635
2021-09-10Change OWNERS am: 89858ea648 am: d5bf5e0f21 am: c903944061 am: 8b7119edf1Neil Fuller
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1824112 Change-Id: Ic513d8943b287733cb25e72e39be254ba81aa41e
2021-09-10Change OWNERS am: 89858ea648 am: d5bf5e0f21 am: c903944061android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Neil Fuller
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1824112 Change-Id: Ifdf0b5414750748bb0fe771eed1ab2dab39fa324
2021-09-10Change OWNERS am: 89858ea648 am: d5bf5e0f21Neil Fuller
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1824112 Change-Id: I08f5966601310fdf4018d9f9fda9b92fdbea4753
2021-09-10Change OWNERS am: 89858ea648android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Neil Fuller
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1824112 Change-Id: I2d5ae054663ad7f450cf8dd94a36c55ed41c7d01
2021-09-10Change OWNERSNeil Fuller
TimeZoneData relates to the TZDB updates so can be owned by core libraries BUG=189810551 Change-Id: Ifd5e445476db2b8b2e6c00c44c1e7f54d9de24e1
2021-06-25Merge "Update OWNERS file" am: 07e3411e0b am: 18a961084a am: d1b943bda2 am: ↵Orion Hodson
b863e39cda Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1739515 Change-Id: I0a10a629ca247446307d276b3e1b314daef09d0d
2021-06-25Merge "Update OWNERS file" am: 07e3411e0b am: 18a961084a am: d1b943bda2Orion Hodson
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1739515 Change-Id: Id0ce9243f9c3f9feadd2be3605a76c9d18ebe136
2021-06-25Merge "Update OWNERS file" am: 07e3411e0b am: 18a961084aOrion Hodson
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1739515 Change-Id: Iddf1a26fc203a9785821ca6a17a0869929228ca2
2021-06-25Merge "Update OWNERS file" am: 07e3411e0bOrion Hodson
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1739515 Change-Id: I4f6d22359ca8b22f3210b6bf727681f7dfe9b92a
2021-06-25Merge "Update OWNERS file"android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Orion Hodson
2021-06-17Update OWNERS fileOrion Hodson
Bug: none Test: treehugger Change-Id: Ib95fca0caf61819c2f592f158a662cd1d45efaa2
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ic693f8b8d81448e0f7434b66d071735dba095529
2021-05-15[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: f46df74c79 ↵Bob Badour
am: 0461b0a00f am: c02114f3a1 am: 9369391c93 am: d0157cc9e7 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1682227 Change-Id: I458c7d204384e0eeabf768981cf9590b07aaf869
2021-04-21[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: f46df74c79 ↵android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseBob Badour
am: 0461b0a00f am: c02114f3a1 am: 9369391c93 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1682227 Change-Id: I09e69578012fe6a0b2e77ccbd55dcd9899dd8db4
2021-04-21[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: f46df74c79 ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseBob Badour
am: 0461b0a00f am: c02114f3a1 am: 9369391c93 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1682227 Change-Id: Ice5b0db4d5e5fc251b7803183f249d553e775405
2021-04-21[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: f46df74c79 ↵Bob Badour
am: 0461b0a00f am: c02114f3a1 am: 9369391c93 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1682227 Change-Id: I8573dd9fa7413f483bf7275a05cfe4c0c952c5af
2021-04-21[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: f46df74c79 ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devBob Badour
am: 0461b0a00f am: c02114f3a1 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1682227 Change-Id: Iee5ce96d221cfd7742a8598ec2876fa3ebf6bef9
2021-04-21[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: f46df74c79 ↵Bob Badour
am: 0461b0a00f Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1682227 Change-Id: If143293f0a523d38d344564be263791519197bd3
2021-04-21[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: f46df74c79Bob Badour
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1682227 Change-Id: I17ca7593a9f821b9ea08fa88ad7f8efd15513d85
2021-04-20[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneDataandroid-s-beta-2android-s-beta-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: oem_template/data_app/build_oem_data_app.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I4bc33d7a0ac68d62dbb5688bd01cffac82450423
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: c1c369ffb6 -s ↵Xin Li
ours am: b4a369c1e1 -s ours am: c03c23b734 -s ours am skip reason: Change-Id Ic969718084953876ee910ad057e4cca8645fc25a with SHA-1 a8c9556a58 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie196fa73b1633a12e573fef57972ca3227bdc5ac
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: c1c369ffb6 -s ↵Xin Li
ours am: b4a369c1e1 -s ours am: c03c23b734 -s ours am skip reason: Change-Id Ic969718084953876ee910ad057e4cca8645fc25a with SHA-1 a8c9556a58 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib59fb30df7b5bf1fb26d7ab93689afc14f755d5c
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: 5eb6850f7d ↵Bob Badour
am: a76d790777 am: 28877c404e am: 64ea1ee767 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1588407 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I17b4349f3a70d5c112df63cd15f0ca959439eef6
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: 5eb6850f7d ↵Bob Badour
am: a76d790777 am: 28877c404e am: 64ea1ee767 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1588407 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ideb8b780b4a5d48b840a6874798d1ad31f908c31
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: c1c369ffb6 -s ↵Xin Li
ours am: b4a369c1e1 -s ours am skip reason: Change-Id Ic969718084953876ee910ad057e4cca8645fc25a with SHA-1 a8c9556a58 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id5f4490ea0c3f67b501283f1a212e521edd14791
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: 5eb6850f7d ↵Bob Badour
am: a76d790777 am: 28877c404e Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1588407 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I393cd906d20bf5732d71c15bd7fd616b5c9fb275
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: c1c369ffb6 -s oursXin Li
am skip reason: Change-Id Ic969718084953876ee910ad057e4cca8645fc25a with SHA-1 a8c9556a58 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If3a0402120c2925c2bd72206e4c751abbf685e76
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: Ic969718084953876ee910ad057e4cca8645fc25a Change-Id: If2d1a819446f4c98c375369dd9b55fb4b4b23dda
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: 5eb6850f7d ↵Bob Badour
am: a76d790777 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1588407 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ieca09bd61699d2123eebf6ddcb11bbd2ea5d70b2
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneData am: 5eb6850f7dBob Badour
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1588407 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib6f15b093ae63b975d22e955c863d56c0cbd8044
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/TimeZoneDataBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp oem_template/data_app_prebuilt/include_app_prebuilt.mk oem_template/xts/Android.mk testing/xts/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I5a2f8eddab516fed4eca7995821657fd7785fda4
2020-11-23Mark ab/6881855 as merged am: ea446020ae am: a8c9556a58Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/13113083 Change-Id: I693bd524b5d648a771b42ed61d770ed204e97edc
2020-11-23Mark ab/6881855 as merged am: ea446020aeXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/13113083 Change-Id: Ic969718084953876ee910ad057e4cca8645fc25a
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: Icc097331325cd6b9e0da7dfd144c3a6b6e98921a
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3382ec9b82 -s ours am: ↵Xin Li
363cfd986c -s ours am: d666aba963 -s ours am skip reason: Change-Id Ife32a6721087b09bd25ee7908e9b7448ae67cd94 with SHA-1 c9ef2f734c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/12796883 Change-Id: I1d7b37156d915b1e4583f680a8f02e8a9408b585
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3382ec9b82 -s ours am: ↵Xin Li
363cfd986c -s ours am skip reason: Change-Id Ife32a6721087b09bd25ee7908e9b7448ae67cd94 with SHA-1 c9ef2f734c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/12796883 Change-Id: Ia5329d7dd5a92d85dfd4b8a186319333884ffe2b
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3382ec9b82 -s oursXin Li
am skip reason: Change-Id Ife32a6721087b09bd25ee7908e9b7448ae67cd94 with SHA-1 c9ef2f734c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/12796883 Change-Id: Id11251ff6d437afa27ecd8039b345a89b5e556b1
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ife32a6721087b09bd25ee7908e9b7448ae67cd94 Change-Id: I4b35e2843f35ae2513e98a81d949cf77a18bce43
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 7bb7c13814 -s ours am: 4468002f09 -s ours am: 4737af2aec -s ours am: bac33cae44 -s ours am skip reason: Change-Id I26966830f706b1ca4d7bfc5a05c1425e03132c0a with SHA-1 e56ef6df6d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/12469986 Change-Id: I31bc01d9e3d06bb97b49d88e6b502384766d4d60
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 7bb7c13814 -s ours am: 4468002f09 -s ours am: 4737af2aec -s ours am skip reason: Change-Id I26966830f706b1ca4d7bfc5a05c1425e03132c0a with SHA-1 e56ef6df6d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/12469986 Change-Id: I9809849793c99bd57112e920a53cd9b0c3225042
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 7bb7c13814 -s ours am: 4468002f09 -s ours am skip reason: Change-Id I26966830f706b1ca4d7bfc5a05c1425e03132c0a with SHA-1 e56ef6df6d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/12469986 Change-Id: I26b40bb7fca9b3e8dcf8034380e3d3ef03d3bd69
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 7bb7c13814 -s ours am skip reason: Change-Id I26966830f706b1ca4d7bfc5a05c1425e03132c0a with SHA-1 e56ef6df6d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/12469986 Change-Id: Ie9fb2b34304c127cdd42ceca1cc3ccf3ec8775f4
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I26966830f706b1ca4d7bfc5a05c1425e03132c0a Change-Id: Iabba75102c5597dbcbd199756e857b3e8c15c536
2020-07-28Merge "Update language to comply with Android's inclusive language guidance" ↵Neil Fuller
am: 9d6fa58ffc am: e1d7eb71dc am: eef84439ef am: c9ef2f734c am: 4b5cbb9757 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1374489 Change-Id: I69457a95d6c3a033364a0dfcf0dcbba5a9e1739a
2020-07-28Merge "Update language to comply with Android's inclusive language guidance" ↵Neil Fuller
am: 9d6fa58ffc am: e1d7eb71dc am: eef84439ef am: c9ef2f734c Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1374489 Change-Id: I2ab8133bb5a9f6a88f5274237a70bf96524c85b9
2020-07-28Merge "Update language to comply with Android's inclusive language guidance" ↵Neil Fuller
am: 9d6fa58ffc am: e1d7eb71dc am: eef84439ef Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1374489 Change-Id: Ife32a6721087b09bd25ee7908e9b7448ae67cd94
2020-07-28Merge "Update language to comply with Android's inclusive language guidance" ↵Neil Fuller
am: 9d6fa58ffc am: e1d7eb71dc Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneData/+/1374489 Change-Id: I9f3001a70b93db30653e78e7efd8bf40e8b944ff
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 08:16:57 +0000