summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-07Snap for 10453563 from 6ef0af71eb356f9d5a09382b24cfcc267f41b280 to ↵aml_med_341711000aml_med_341619000aml_med_341513600aml_med_341312300aml_med_341312020aml_med_341111000aml_med_341011000aml_med_340922010android14-mainline-media-releaseAndroid Build Coastguard Worker
mainline-media-release Change-Id: I083adb1b049a3297ec6aa499adc4d928755d0e02
2022-05-09Snap for 8562061 from 2f6a0c62ab5cee315543b7f72125ec443a220ec7 to ↵aml_med_331911000aml_med_331712010aml_med_331612000aml_med_331511000aml_med_331410000aml_med_331318000aml_med_331115000aml_med_331012020android13-mainline-media-releaseAndroid Build Coastguard Worker
mainline-media-release Change-Id: I726c8b598ed874bf2a8ada3af64a1af41d6cf340
2022-03-08Add license_note am: 2e8602f3d3 am: df6a014c83 am: 071cf293d5 am: 0612a141ed ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseBob Badour
am: 2f6a0c62ab Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/2012159 Change-Id: I0ad2ab3248cb6ecad75500ce65b45caa6da4bfd2
2022-03-08Add license_note am: 2e8602f3d3 am: df6a014c83 am: 071cf293d5 am: 0612a141edaml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_ase_331311020aml_ase_331112000aml_ase_331011020android13-mainline-tzdata4-releaseandroid13-mainline-appsearch-releaseaml_tz4_332714010Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/2012159 Change-Id: Icf0c0b31332be0b57bacedd56bfdc32a325fbc1a
2022-03-08Add license_note am: 2e8602f3d3 am: df6a014c83 am: 071cf293d5 am: 0612a141edBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/2012159 Change-Id: I9dc752e783469d365d301c06039b61c56e3e7bcb
2022-03-08Add license_note am: 2e8602f3d3 am: df6a014c83 am: 071cf293d5t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-u-beta-1-gplandroid-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_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000main-16k-with-phonesmain-16kandroid13-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-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/2012159 Change-Id: I319e1d6215734c388d7aaeef4db860b203da4a2d
2022-03-08Add license_note am: 2e8602f3d3 am: df6a014c83Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/2012159 Change-Id: I882de1b0f5d9cec9ed8c213a3ed7ff3c5bb6018a
2022-03-08Add license_note am: 2e8602f3d3Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/2012159 Change-Id: I16219adffce8efbb2bf8c04d7069f72101aeb54c
2022-03-07Add license_noteBob Badour
Comments not preserved during refresh. Bug: 68860345 Test: m nothing Change-Id: Idd79265999d03f3b35f82def708907866efdc750
2021-06-19Snap for 7474514 from ea08e877d5033260b7c6a4847e9e57cbafd8a3b3 to ↵android-mainline-12.0.0_r89android-mainline-12.0.0_r74android-mainline-12.0.0_r62android-mainline-12.0.0_r46android-mainline-12.0.0_r29android-mainline-12.0.0_r12android-mainline-12.0.0_r119android-mainline-12.0.0_r104android12-mainline-media-releaseandroid-build-team Robot
mainline-media-release Change-Id: I9798b85d65be218e1e3823d72261c62f767d8efd
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I3aad2c05a1b42703e1c11778e91dee4d58a2d37d
2021-05-29[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/lustria am: ↵Bob Badour
c49f024acb am: 197fe642d7 am: ca238c3fb8 am: 1c0e199666 am: 44aacea340 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1588698 Change-Id: Ia6feb457253b1ba0e1aaf4609163c264a218e265
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 442b46cd11 -s ↵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-releaseXin Li
ours am: 97199e2b9c -s ours am: 544260684d -s ours am skip reason: Change-Id I2bdf9f6af681ee700f86a9ef2c5609ff29e3f254 with SHA-1 5e08b7cf6c is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8538e06af69a94c0f0ca83bbfc81a4ec52105995
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 442b46cd11 -s ↵Xin Li
ours am: 97199e2b9c -s ours am: 544260684d -s ours am skip reason: Change-Id I2bdf9f6af681ee700f86a9ef2c5609ff29e3f254 with SHA-1 5e08b7cf6c is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib4a4fe7d642bbd6d1625ad79f968446aa43e1204
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 442b46cd11 -s ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-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_r12android-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-devandroid12L-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-releaseandroid12-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-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
ours am: 97199e2b9c -s ours am skip reason: Change-Id I2bdf9f6af681ee700f86a9ef2c5609ff29e3f254 with SHA-1 5e08b7cf6c is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibd14e3951beec207fa2c143e72e82c5d7489bafa
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 442b46cd11 -s oursXin Li
am skip reason: Change-Id I2bdf9f6af681ee700f86a9ef2c5609ff29e3f254 with SHA-1 5e08b7cf6c is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib411b6f9d2083e07eed0bc9337c16aa33226d241
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I2bdf9f6af681ee700f86a9ef2c5609ff29e3f254 Change-Id: I0c74791d944d31f5c2d67aab6cba15bfd8792b9b
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/lustria am: ↵Bob Badour
c49f024acb am: 197fe642d7 am: ca238c3fb8 am: 1c0e199666 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1588698 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7677c43fa6497ae4defc7678196b7fa930fccbf7
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/lustria am: ↵Bob Badour
c49f024acb am: 197fe642d7 am: ca238c3fb8 am: 1c0e199666 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1588698 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ida51bca12b14375091e0f2b9662eed31f69b6f9f
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/lustria am: ↵Bob Badour
c49f024acb am: 197fe642d7 am: ca238c3fb8 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1588698 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1a17d34b37363c59a8634deee79c974d477533a8
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/lustria am: ↵Bob Badour
c49f024acb am: 197fe642d7 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1588698 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0bbe1c5f48ba263fb19ba432508969e3eebadb1a
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/lustria am: c49f024acbBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1588698 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib55d58c283c7798886da5460eac342eb787f6251
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/lustriaandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-MIT SPDX-license-identifier-OFL to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ie90c6ad2b5d32879ebeae1048a5c64ea5cf87f2f
2020-12-10[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: fc40bce7c5 -s ↵Xin Li
ours am: 384dd9144c -s ours am: 5e08b7cf6c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1521258 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8f71a3cf35c83bd10ae8ad9232b782321f3251b9
2020-12-10[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: fc40bce7c5 -s ↵Xin Li
ours am: 384dd9144c -s ours am skip reason: Change-Id I336f2eca214c611698cc1b536e7ff80c800b397a with SHA-1 b41b262136 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1521258 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2bdf9f6af681ee700f86a9ef2c5609ff29e3f254
2020-12-10[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: fc40bce7c5 -s oursXin Li
am skip reason: Change-Id I336f2eca214c611698cc1b536e7ff80c800b397a with SHA-1 b41b262136 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1521258 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I26a266880615387d19d6f15daeb562547719f299
2020-12-08DO NOT MERGE - Merge Android R QPR1Xin Li
Bug: 172690556 Merged-In: I336f2eca214c611698cc1b536e7ff80c800b397a Change-Id: I139c4c62c9b05937aabb48bc9b4bcf001044fed3
2020-12-03[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ↵Xin Li
b41b262136 -s ours am: 3d75182b76 -s ours am skip reason: Change-Id I463ed2e51635573a01d13d90dd437e03d2d9f641 with SHA-1 9618d05d2d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/13120508 Change-Id: Ie27a66daa6ed5d35ff546cda886e60b4c0a8cef9
2020-12-03[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ↵Xin Li
b41b262136 -s ours am skip reason: Change-Id I463ed2e51635573a01d13d90dd437e03d2d9f641 with SHA-1 9618d05d2d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/13120508 Change-Id: I8a10116b9eb2f49d6b77b0bdac040ed296b78917
2020-11-23Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855temp_rvc_qpr_mergeXin Li
Bug: 172690556 Merged-In: I463ed2e51635573a01d13d90dd437e03d2d9f641 Change-Id: I336f2eca214c611698cc1b536e7ff80c800b397a
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 9c636cf8e9 -s ours ↵Xin Li
am: b8b8219469 -s ours am: e9a51f00be -s ours am: 899d696560 -s ours am skip reason: Change-Id If33e1a521aa7d7253e8f558942d1e3d8a31e8dae with SHA-1 d2167f2039 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1466502 Change-Id: I2219b0f178368b3873809d89d536e1afd42239af
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 9c636cf8e9 -s ours ↵Xin Li
am: b8b8219469 -s ours am: e9a51f00be -s ours am skip reason: Change-Id If33e1a521aa7d7253e8f558942d1e3d8a31e8dae with SHA-1 d2167f2039 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1466502 Change-Id: If19630df2e7872a545dfe418ee74d5b4ebef7141
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 9c636cf8e9 -s ours ↵Xin Li
am: b8b8219469 -s ours am skip reason: Change-Id If33e1a521aa7d7253e8f558942d1e3d8a31e8dae with SHA-1 d2167f2039 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1466502 Change-Id: Id2600ebcb1a740ca5ab9ec07e79ee333fcafc8ef
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 9c636cf8e9 -s oursXin Li
am skip reason: Change-Id If33e1a521aa7d7253e8f558942d1e3d8a31e8dae with SHA-1 d2167f2039 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1466502 Change-Id: I377a256ce3203b651ae2908a9cfff3e29ab4cda5
2020-10-19Merge redfin/bramble support.Xin Li
Bug: 171218636 Merged-In: If33e1a521aa7d7253e8f558942d1e3d8a31e8dae Change-Id: I29268ba0478d2c52b75d1c8bdb964ba38e29fe00
2020-10-13[automerger skipped] Merge ab/6749736 in stage. am: d2167f2039 -s ours am: ↵Xin Li
875b84bc52 -s ours am: 4eea1d4242 -s ours am skip reason: Change-Id I27aaf6b40bf622f7168846a0f5b35316f9b5138c with SHA-1 92da5d93fa is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/12804432 Change-Id: Ie2fee68bf9c478b1afd80b13e2926536a25a7823
2020-10-13[automerger skipped] Merge ab/6749736 in stage. am: d2167f2039 -s ours am: ↵Xin Li
875b84bc52 -s ours am skip reason: Change-Id I27aaf6b40bf622f7168846a0f5b35316f9b5138c with SHA-1 92da5d93fa is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/12804432 Change-Id: I8e88531a2cb80602c0c19ebefdf2089da6e98f6e
2020-10-13[automerger skipped] Merge ab/6749736 in stage. am: d2167f2039 -s oursXin Li
am skip reason: Change-Id I27aaf6b40bf622f7168846a0f5b35316f9b5138c with SHA-1 92da5d93fa is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/12804432 Change-Id: I9cb34dbf9283ea2ce2f68138e9b9a9ded2d66544
2020-10-08Merge ab/6749736 in stage.Xin Li
Bug: 167233921 Merged-In: I27aaf6b40bf622f7168846a0f5b35316f9b5138c Change-Id: If33e1a521aa7d7253e8f558942d1e3d8a31e8dae
2020-09-21[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: a2ce4bb806 am: fcf35b5062 -s ours am: 129ee1a03f -s ours am: 1d6265642c -s ours am: 9618d05d2d -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1430117 Change-Id: I735906a35b0917e7441c8b5b51742fa5e3a15887
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: a2ce4bb806 am: fcf35b5062 -s ours am: 129ee1a03f -s ours am: 1d6265642c -s ours am skip reason: Change-Id I16a204e08cff651469f1358d944a9eb738083d4a with SHA-1 4b9cd14c59 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1430117 Change-Id: I463ed2e51635573a01d13d90dd437e03d2d9f641
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: a2ce4bb806 am: fcf35b5062 -s ours am: 129ee1a03f -s ours am skip reason: Change-Id I16a204e08cff651469f1358d944a9eb738083d4a with SHA-1 4b9cd14c59 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1430117 Change-Id: Ic041ea83604c5d65fa42eb69ca0dfc7d698080fa
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: a2ce4bb806 am: fcf35b5062 -s ours am skip reason: Change-Id I16a204e08cff651469f1358d944a9eb738083d4a with SHA-1 4b9cd14c59 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1430117 Change-Id: I0969e054ce8aa46cbba6c0d73448753bae6d6554
2020-09-19Merge mainline-release 6664920 to master - DO NOT MERGE am: a2ce4bb806Bill Yi
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1430117 Change-Id: I1802c7ff72266f6f44c04d9de6515b0cba991350
2020-09-17Merge mainline-release 6664920 to master - DO NOT MERGEplatform-tools-30.0.5Bill Yi
Merged-In: I16a204e08cff651469f1358d944a9eb738083d4a Change-Id: I1eac3087bdb270236092854c544c1cd77d2be727
2020-09-15[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: b0b47b4c02 -s ours am: 4b9cd14c59 -s ours am: 6e1d2df57f -s ours am: daf52faf62 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/12579356 Change-Id: If1ff3519d6f021b987d4c13ce539dce9bbcecfd4
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: b0b47b4c02 -s ours am: 4b9cd14c59 -s ours am: 6e1d2df57f -s ours am skip reason: Change-Id I4066da55aa7b3aac606d5bbf9830f7265a82b2ca with SHA-1 0f4da2db17 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/12579356 Change-Id: Iacb67828ca0425c0c9843e942c525e0c27939199
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: b0b47b4c02 -s ours am: 4b9cd14c59 -s ours am skip reason: Change-Id I4066da55aa7b3aac606d5bbf9830f7265a82b2ca with SHA-1 0f4da2db17 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/12579356 Change-Id: Id47c50ff17a70ae23818554d448b1cd7223ed080
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: b0b47b4c02 -s ours am skip reason: Change-Id I4066da55aa7b3aac606d5bbf9830f7265a82b2ca with SHA-1 0f4da2db17 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/12579356 Change-Id: I16a204e08cff651469f1358d944a9eb738083d4a
2020-09-13Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGEBill Yi
Merged-In: I4066da55aa7b3aac606d5bbf9830f7265a82b2ca Change-Id: I261d5909b521d17e1e34f3dfe01570ccdd40277a
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 10:11:44 +0000