summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-06-08Reclassify OFL as notice per cl/537072410 am: 7f1841380b am: bb6391cf05 am: ↵HEADandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29mastermainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseBob Badour
571dfaceeb am: 77ef2602cc am: 823758c1aa am: 1f8a831c80 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/2611895 Change-Id: Idb04cb383cfce1476c99ccab5484879b013744c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Reclassify OFL as notice per cl/537072410 am: 7f1841380b am: bb6391cf05 am: ↵Bob Badour
571dfaceeb am: 77ef2602cc am: 823758c1aa Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/2611895 Change-Id: I6081ae23ba411b63e5217019bc20e7a425c1c471 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Reclassify OFL as notice per cl/537072410 am: 7f1841380b am: bb6391cf05 am: ↵Bob Badour
571dfaceeb am: 77ef2602cc Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/2611895 Change-Id: Ia67cb70bcac28eb96fda48a5fa9e8928569ddd99 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Reclassify OFL as notice per cl/537072410 am: 7f1841380b am: bb6391cf05 am: ↵Bob Badour
571dfaceeb Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/2611895 Change-Id: I41b502c1315365f3d063bbd862103b9a58ffec86 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Reclassify OFL as notice per cl/537072410 am: 7f1841380b am: bb6391cf05Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/2611895 Change-Id: I416ce0f948711df7e83f394a5af6a87460bab62d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Reclassify OFL as notice per cl/537072410 am: 7f1841380bBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/2611895 Change-Id: I5d17600e9978dc3cc49ca3835894378d28382dd3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-01Reclassify OFL as notice per cl/537072410Bob Badour
Test: m droid dist Change-Id: Id9c75ad398e4b7fc7029c05c3bed8260d2f69e2c
2022-03-08Add license_note am: 30f04785be am: ce8a31e760 am: 33ae2c60fe am: f34f01823a ↵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: af5779f79b Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/2011798 Change-Id: Ia9462c2b477711d83edf168c3944d76ef246847b
2022-03-08Add license_note am: 30f04785be am: ce8a31e760 am: 33ae2c60fe am: f34f01823aaml_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/zilla-slab/+/2011798 Change-Id: Iea13a3dac2ad8274dd97b9dd031991558dad450d
2022-03-08Add license_note am: 30f04785be am: ce8a31e760 am: 33ae2c60fe am: f34f01823aBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/2011798 Change-Id: I21b4ceb1a27b3825915c4cedb0077c2469880d8d
2022-03-08Add license_note am: 30f04785be am: ce8a31e760 am: 33ae2c60fet_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/zilla-slab/+/2011798 Change-Id: If3404960cf762398317b49b9a81a2b1c5bbd174f
2022-03-08Add license_note am: 30f04785be am: ce8a31e760Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/2011798 Change-Id: I6f5d7ebad8b62d26ad23a5dd17922a189a75f785
2022-03-08Add license_note am: 30f04785beBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/2011798 Change-Id: I0179518bf1c3c9371940527f40482e9c4afb097a
2022-03-07Add license_noteBob Badour
Comments not preserved during refresh. Bug: 68860345 Test: m nothing Change-Id: Ie0855df20cb89ca38b4a34a738e3c2c170caeaf2
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ifaabce5ddb636d3729330b4e01988ebaa5dfb7e7
2021-05-29[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/zilla-slab am: ↵Bob Badour
776443897f am: 5b376c16ce am: 801eb44336 am: ed55bed370 am: 6c71a35297 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/1588638 Change-Id: Ie5b14bcb05ac1e33f7a3ebfd51edef0e6cffc6b9
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d19a2e9bb4 -s ↵Xin Li
ours am: 535e7f3571 -s ours am: e8953d8d4b -s ours am skip reason: Change-Id I3f004cd974d3cb27751cd3d6b142aa4f8d14cfd7 with SHA-1 09dcddf076 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia7cf3778dfafc3cdca44d4fc78afa2b979732edf
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d19a2e9bb4 -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: 535e7f3571 -s ours am: e8953d8d4b -s ours am skip reason: Change-Id I3f004cd974d3cb27751cd3d6b142aa4f8d14cfd7 with SHA-1 09dcddf076 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I56ee9615573ecd589996739d470730851e3a2a92
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d19a2e9bb4 -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: 535e7f3571 -s ours am skip reason: Change-Id I3f004cd974d3cb27751cd3d6b142aa4f8d14cfd7 with SHA-1 09dcddf076 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9b3396e4bcccc62dc288c58f6e8b57753923c075
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d19a2e9bb4 -s oursXin Li
am skip reason: Change-Id I3f004cd974d3cb27751cd3d6b142aa4f8d14cfd7 with SHA-1 09dcddf076 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I01418f83ce21f0ecb62a26204487646748208838
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: I3f004cd974d3cb27751cd3d6b142aa4f8d14cfd7 Change-Id: Id8cbc41fe4fd5af8685d13b2a6effffd110a9dc4
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/zilla-slab am: ↵Bob Badour
776443897f am: 5b376c16ce am: 801eb44336 am: ed55bed370 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/1588638 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I50d9037f8c2571e15605a7b36225e66962a74318
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/zilla-slab am: ↵Bob Badour
776443897f am: 5b376c16ce am: 801eb44336 am: ed55bed370 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/1588638 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibc54e7a38b923f3fdf49e1e40ce7f406db9e6b77
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/zilla-slab am: ↵Bob Badour
776443897f am: 5b376c16ce am: 801eb44336 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/1588638 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia8f33335dc899481356b3c5c6d8556ad8811bc2f
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/zilla-slab am: ↵Bob Badour
776443897f am: 5b376c16ce Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/1588638 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1d8f885a2af001602cd12716ed248c3f46a3f71d
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/zilla-slab am: 776443897fBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/1588638 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib00a6a6650bf82b04ea89d14d878976b991ad4e8
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/zilla-slabandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-MIT SPDX-license-identifier-OFL legacy_by_exception_only to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I26ff782a43ddc8ad9c7e9764d83ad3b00b77c5bc
2020-11-24Mark ab/6881855 as merged am: 011fc5b49e am: 09dcddf076Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/13112760 Change-Id: I71f88e2cd98c3c57ece28cc90ceccc126673ee45
2020-11-24Mark ab/6881855 as merged am: 011fc5b49eXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/13112760 Change-Id: I3f004cd974d3cb27751cd3d6b142aa4f8d14cfd7
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I43e10995ccd41a5edb231ed6e5cec7ddcad29efa
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: eea4985a9a -s ours am: ↵Xin Li
d790e1a1b8 -s ours am: 3044a2658e -s ours am skip reason: Change-Id I9b3f3409f8f39c1ed531a0928410cb79c23a4bb2 with SHA-1 ad214273e0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/12796461 Change-Id: If5f10d590e2c7f3849ea4fed8847240ea0b0e09f
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: eea4985a9a -s ours am: ↵Xin Li
d790e1a1b8 -s ours am skip reason: Change-Id I9b3f3409f8f39c1ed531a0928410cb79c23a4bb2 with SHA-1 ad214273e0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/12796461 Change-Id: I4db599ce8c219ab593dbf2ce9c8a2013841415af
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: eea4985a9a -s oursXin Li
am skip reason: Change-Id I9b3f3409f8f39c1ed531a0928410cb79c23a4bb2 with SHA-1 ad214273e0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/12796461 Change-Id: Ia4eda69e916ff9e720ccb7af23a1038a6310d2a3
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I9b3f3409f8f39c1ed531a0928410cb79c23a4bb2 Change-Id: Ie895fb30dbc448343f99d979c92154ac60081ca9
2020-09-11[automerger skipped] Merge Android R am: cdc11f9473 -s ours am: e43a8d70a4 ↵Xin Li
-s ours am: 5c86ef4a87 -s ours am: 1df0045c27 -s ours am: dbf7877029 -s ours am skip reason: Change-Id I70c611122b5b5dd92fc7c17a0ef560dcb0efba70 with SHA-1 d51e98504b is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/1422352 Change-Id: I95f0f394885d163e2781687a0b18d41998760de9
2020-09-11[automerger skipped] Merge Android R am: cdc11f9473 -s ours am: e43a8d70a4 ↵Xin Li
-s ours am: 5c86ef4a87 -s ours am: 1df0045c27 -s ours am skip reason: Change-Id I70c611122b5b5dd92fc7c17a0ef560dcb0efba70 with SHA-1 d51e98504b is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/1422352 Change-Id: Id2a35f9e240216774d2d9543db9e83101490bbda
2020-09-11[automerger skipped] Merge Android R am: cdc11f9473 -s ours am: e43a8d70a4 ↵Xin Li
-s ours am: 5c86ef4a87 -s ours am skip reason: Change-Id I70c611122b5b5dd92fc7c17a0ef560dcb0efba70 with SHA-1 d51e98504b is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/1422352 Change-Id: I0ccb140eb2e7309f5a670aa85db0cfd6ad27cf63
2020-09-11[automerger skipped] Merge Android R am: cdc11f9473 -s ours am: e43a8d70a4 ↵Xin Li
-s ours am skip reason: Change-Id I70c611122b5b5dd92fc7c17a0ef560dcb0efba70 with SHA-1 d51e98504b is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/1422352 Change-Id: I7135275198b4622ab0b25714cb1c214dd0821f0d
2020-09-11[automerger skipped] Merge Android R am: cdc11f9473 -s oursXin Li
am skip reason: Change-Id I70c611122b5b5dd92fc7c17a0ef560dcb0efba70 with SHA-1 d51e98504b is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/1422352 Change-Id: I828e1f6b293eec9496ca6d4c75230385fe2e17e9
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I70c611122b5b5dd92fc7c17a0ef560dcb0efba70 Change-Id: I70df432e9c39f6c197ad919f9031407ec9211706
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d51e98504b -s ours am: 3d8505a718 -s ours am: da925ec722 -s ours am: da276be885 -s ours am skip reason: Change-Id I940b5608806ee58ce31295b6e6da81200772dc46 with SHA-1 10597d6566 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/12470112 Change-Id: I79422387eabf5c849dc0919a8352f129dc399bfc
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d51e98504b -s ours am: 3d8505a718 -s ours am: da925ec722 -s ours am skip reason: Change-Id I940b5608806ee58ce31295b6e6da81200772dc46 with SHA-1 10597d6566 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/12470112 Change-Id: Ie58dfdab74ce5c90b5605aa094ceb44ec1fb36a1
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d51e98504b -s ours am: 3d8505a718 -s ours am skip reason: Change-Id I940b5608806ee58ce31295b6e6da81200772dc46 with SHA-1 10597d6566 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/12470112 Change-Id: I9365a3a9a1cc7c84cf45a44f681fbf33f526ce6f
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d51e98504b -s ours am skip reason: Change-Id I940b5608806ee58ce31295b6e6da81200772dc46 with SHA-1 10597d6566 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/12470112 Change-Id: If4c2e655d3596b4eb2ec565844519a6fa98c69fb
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I940b5608806ee58ce31295b6e6da81200772dc46 Change-Id: I70c611122b5b5dd92fc7c17a0ef560dcb0efba70
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 646ccf753d -s ours am: 10597d6566 am: ad214273e0 am: 002b4ecc54 -s ours am skip reason: subject contains skip directive Change-Id: I743cc0ced8cd1dfc01f973b57d414b2f711cba22
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 646ccf753d -s ours am: 10597d6566 am: ad214273e0 Change-Id: I7f70be1be649e395e9ff6326dc0f9c4124cdedcf
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 646ccf753d -s ours am: 10597d6566 Change-Id: I9b3f3409f8f39c1ed531a0928410cb79c23a4bb2
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 646ccf753d -s ours am skip reason: subject contains skip directive Change-Id: I940b5608806ee58ce31295b6e6da81200772dc46
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li
Bug: 151763422 Change-Id: Ib754acc8cd83aabb0cb74b7f0f8bb478021d9c5e
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 22:06:34 +0000