summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-06-08Reclassify OFL as notice per cl/537072410 am: 1a85bfcdd8 am: 9d3077f3c6 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
348ec68707 am: ee9dd21f2e am: 5159a51a5c am: b1f2c432c7 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/2611417 Change-Id: I6dfc69a6b42fd483b4a65dbbecf21f48a2ccf5df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Reclassify OFL as notice per cl/537072410 am: 1a85bfcdd8 am: 9d3077f3c6 am: ↵Bob Badour
348ec68707 am: ee9dd21f2e am: 5159a51a5c Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/2611417 Change-Id: If9a5c291c999378d006d7a857e242efcaa5e9aeb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Reclassify OFL as notice per cl/537072410 am: 1a85bfcdd8 am: 9d3077f3c6 am: ↵Bob Badour
348ec68707 am: ee9dd21f2e Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/2611417 Change-Id: I19d62c3ed5025c1b2c2caa4afba73564f0c666b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Reclassify OFL as notice per cl/537072410 am: 1a85bfcdd8 am: 9d3077f3c6 am: ↵Bob Badour
348ec68707 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/2611417 Change-Id: I5438c9a9d9fa6f869adc0d873f7d65a17f55d601 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Reclassify OFL as notice per cl/537072410 am: 1a85bfcdd8 am: 9d3077f3c6Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/2611417 Change-Id: Ib2f901ba24f61dca05184117709509a3fe1ae472 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Reclassify OFL as notice per cl/537072410 am: 1a85bfcdd8Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/2611417 Change-Id: I609b392c4f6a5a9e9bccedf65b18175694d278f2 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: Ia365afe28142125a0a5fc0fd6c9c6a92b195fb3c
2022-03-08Add license_note am: 746b4698ee am: a79b5d447e am: 70218cb58d am: fd6958f6e0 ↵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: f4e465b1f5 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/2012220 Change-Id: I7985f317d15c5e0b8d73a3db8370f6c6ef4ad87f
2022-03-08Add license_note am: 746b4698ee am: a79b5d447e am: 70218cb58d am: fd6958f6e0aml_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/arbutus-slab/+/2012220 Change-Id: I9ece1e7347d3384d96125b53e925b84f82eb5b90
2022-03-08Add license_note am: 746b4698ee am: a79b5d447e am: 70218cb58d am: fd6958f6e0Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/2012220 Change-Id: I1b7a3f47c750aef24a7b0b6643e61e8c6e070f88
2022-03-08Add license_note am: 746b4698ee am: a79b5d447e am: 70218cb58dt_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/arbutus-slab/+/2012220 Change-Id: I7cb0b9fe4fd88332418c3a6b95baedd536b2fcf1
2022-03-08Add license_note am: 746b4698ee am: a79b5d447eBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/2012220 Change-Id: I26f4bfc9437c3586b7f4b5ddaf29104d4d752c26
2022-03-08Add license_note am: 746b4698eeBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/2012220 Change-Id: I9e330a7345efbc0b700256fcca0d012da3f838fb
2022-03-07Add license_noteBob Badour
Comments not preserved during refresh. Bug: 68860345 Test: m nothing Change-Id: Icdb829da0697ab67eeeafe0670f522e5e0fcd472
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I1a44867ed70b7c1e9a67a2dafc824e75d2ff5cb8
2021-05-29[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arbutus-slab am: ↵Bob Badour
330bfa2c97 am: 30aa993318 am: cbf4748158 am: 778441e8b5 am: e476fde943 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/1588695 Change-Id: I5f10fc136b58cb9e48fd0868bd57a3b89bd4f754
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6e58bb6344 -s ↵Xin Li
ours am: e02f47dc6b -s ours am: 109401b9e3 -s ours am skip reason: Change-Id I17dd6b71aa576e98e986dd000cf70429f313ac91 with SHA-1 4ca282809d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I688578caf7c218def0fa13457439e451e32119a3
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6e58bb6344 -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: e02f47dc6b -s ours am: 109401b9e3 -s ours am skip reason: Change-Id I17dd6b71aa576e98e986dd000cf70429f313ac91 with SHA-1 4ca282809d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia912e36225f992da2d467cd457677663fbbe1ab4
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6e58bb6344 -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: e02f47dc6b -s ours am skip reason: Change-Id I17dd6b71aa576e98e986dd000cf70429f313ac91 with SHA-1 4ca282809d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I55d8fe8a5878ed867e93b6a6423f231e4389c29c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6e58bb6344 -s oursXin Li
am skip reason: Change-Id I17dd6b71aa576e98e986dd000cf70429f313ac91 with SHA-1 4ca282809d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I96202366e25a7ace049b0e8eba11eabbf52b299f
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: I17dd6b71aa576e98e986dd000cf70429f313ac91 Change-Id: Ic80011c93f84dc3420cfe47a9650e2f144b99e66
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arbutus-slab am: ↵Bob Badour
330bfa2c97 am: 30aa993318 am: cbf4748158 am: 778441e8b5 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/1588695 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I15be3d7da31288d839b001bdde44de083a609500
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arbutus-slab am: ↵Bob Badour
330bfa2c97 am: 30aa993318 am: cbf4748158 am: 778441e8b5 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/1588695 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I308c31bbdae4df7d5def5a2177702b648a150da4
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arbutus-slab am: ↵Bob Badour
330bfa2c97 am: 30aa993318 am: cbf4748158 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/1588695 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3f5a6de93e656b7f4b79ed0487996c20128aaf3a
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arbutus-slab am: ↵Bob Badour
330bfa2c97 am: 30aa993318 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/1588695 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I95e3a6f9d9853cc085cf2834e6beb3de3b05bf7c
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arbutus-slab am: ↵Bob Badour
330bfa2c97 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/1588695 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I990044df0b968183e3bb54be0194287d8d72f07e
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arbutus-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: Ia6db8776ce16dbe83d01ab38684c201767bc89fe
2020-11-24Mark ab/6881855 as merged am: f8cd8fa859 am: 4ca282809dXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/13111417 Change-Id: I69948a2ccd761d584688b66ff01d6c35dc37f3dc
2020-11-24Mark ab/6881855 as merged am: f8cd8fa859Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/13111417 Change-Id: I17dd6b71aa576e98e986dd000cf70429f313ac91
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I1f2a672465b3c36f774cbbce304a5a438245e4e4
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: ca658b2a22 -s ours am: ↵Xin Li
5143229d31 -s ours am: 42d23274b4 -s ours am skip reason: Change-Id I045cfe79e554db7bbd3a33525ad3275b043b83a4 with SHA-1 022d935b68 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/12795746 Change-Id: Iff427c1b62887b63177080f3503a3c7a37e8a34b
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: ca658b2a22 -s ours am: ↵Xin Li
5143229d31 -s ours am skip reason: Change-Id I045cfe79e554db7bbd3a33525ad3275b043b83a4 with SHA-1 022d935b68 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/12795746 Change-Id: I507bae8c3665584ab0045ac79a7e255665f7857a
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: ca658b2a22 -s oursXin Li
am skip reason: Change-Id I045cfe79e554db7bbd3a33525ad3275b043b83a4 with SHA-1 022d935b68 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/12795746 Change-Id: I2fd2e9cf96dd2628ae075d7eeaaae123603b0682
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I045cfe79e554db7bbd3a33525ad3275b043b83a4 Change-Id: I69089b35195125df48fc99f74d77ef8b35a1f7bd
2020-09-11[automerger skipped] Merge Android R am: 0e9196699b -s ours am: aa5a3115b7 ↵Xin Li
-s ours am: 82e6af7fcd -s ours am: 09501520f0 -s ours am: acb42272ea -s ours am skip reason: Change-Id I748f0c03addce78910b67d3e2a1ee2df633d1595 with SHA-1 f7b16556de is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/1422311 Change-Id: I21ebdadbfbb31750602d9577d631d898f048d11c
2020-09-11[automerger skipped] Merge Android R am: 0e9196699b -s ours am: aa5a3115b7 ↵Xin Li
-s ours am: 82e6af7fcd -s ours am: 09501520f0 -s ours am skip reason: Change-Id I748f0c03addce78910b67d3e2a1ee2df633d1595 with SHA-1 f7b16556de is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/1422311 Change-Id: Ic30dca2cb5fd6c841f55c94415d6b03d2408bd13
2020-09-11[automerger skipped] Merge Android R am: 0e9196699b -s ours am: aa5a3115b7 ↵Xin Li
-s ours am: 82e6af7fcd -s ours am skip reason: Change-Id I748f0c03addce78910b67d3e2a1ee2df633d1595 with SHA-1 f7b16556de is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/1422311 Change-Id: Ibbb173cb26db772772c70785b684ad7902680328
2020-09-11[automerger skipped] Merge Android R am: 0e9196699b -s ours am: aa5a3115b7 ↵Xin Li
-s ours am skip reason: Change-Id I748f0c03addce78910b67d3e2a1ee2df633d1595 with SHA-1 f7b16556de is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/1422311 Change-Id: Ia4906e9d958162ccdb0c775c73157d7e6cbec598
2020-09-11[automerger skipped] Merge Android R am: 0e9196699b -s oursXin Li
am skip reason: Change-Id I748f0c03addce78910b67d3e2a1ee2df633d1595 with SHA-1 f7b16556de is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/1422311 Change-Id: I7974ab9cb979db501809e2dd36545076e737d3ad
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I748f0c03addce78910b67d3e2a1ee2df633d1595 Change-Id: I157b3d7944cc523ec9dfab3a791d2f97d56786b3
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: f7b16556de -s ours am: 695bc30a81 -s ours am: a5aae91534 -s ours am: 3fd23ee5a0 -s ours am skip reason: Change-Id I7b1d8e0b66c85e3e0c45b063ca75ec1bd5ad0480 with SHA-1 5025278686 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/12469673 Change-Id: Ifbd34348afdb761f7a15c1ead6dc17d4b60a8136
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: f7b16556de -s ours am: 695bc30a81 -s ours am: a5aae91534 -s ours am skip reason: Change-Id I7b1d8e0b66c85e3e0c45b063ca75ec1bd5ad0480 with SHA-1 5025278686 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/12469673 Change-Id: Ia2a339cd645f6b3d568b5f8a9477cd22e73740a7
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: f7b16556de -s ours am: 695bc30a81 -s ours am skip reason: Change-Id I7b1d8e0b66c85e3e0c45b063ca75ec1bd5ad0480 with SHA-1 5025278686 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/12469673 Change-Id: Iddf6e1a0289cd36c64b9361cad9883a2a6aa7ce7
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: f7b16556de -s ours am skip reason: Change-Id I7b1d8e0b66c85e3e0c45b063ca75ec1bd5ad0480 with SHA-1 5025278686 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/12469673 Change-Id: I3b3a3a064cf86da174c1a4f0c11da866f8414c47
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I7b1d8e0b66c85e3e0c45b063ca75ec1bd5ad0480 Change-Id: I748f0c03addce78910b67d3e2a1ee2df633d1595
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: a4585df413 -s ours am: 5025278686 am: 022d935b68 am: 77c297359d -s ours am skip reason: subject contains skip directive Change-Id: I668ffbe8ae565e791a3d1c871091404cbd26c22f
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: a4585df413 -s ours am: 5025278686 am: 022d935b68 Change-Id: Ib76c341862a75ae3e725d45afa6c59322c6284bc
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: a4585df413 -s ours am: 5025278686 Change-Id: I045cfe79e554db7bbd3a33525ad3275b043b83a4
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: a4585df413 -s ours am skip reason: subject contains skip directive Change-Id: I7b1d8e0b66c85e3e0c45b063ca75ec1bd5ad0480
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: I528b29bccd2eacf31ef41cb09d1fd6012fcf0417