aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-07Snap for 11541002 from 88eb02ddd6a1910700f778db0fcb9018a0c2a7e5 to sdk-releaseplatform-tools-35.0.1sdk-releaseAndroid Build Coastguard Worker
Change-Id: Iffd73cd4478c45ad0959650ca4037edbb0964a85
2023-12-13Snap for 11211409 from 96bc766756fcc94cab889600c090747c3c538875 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: Icb8998780f17b09a4ad5c8e4ee940edb4b34f871
2023-10-10Snap for 10929834 from 9a8e659a5ced1e06570918c8f6d598d2a81a65a3 to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I002d57f7d51118f08ba35dba470ab6e1caf6dc94
2023-06-28Snap for 10399941 from 2c93bf1691a424e61092d93e7435866b79fb2a91 to sdk-releaseplatform-tools-34.0.5platform-tools-34.0.4Android Build Coastguard Worker
Change-Id: I08020aa87e3caba10cdaf8a35ad2ffe516d359dc
2023-06-08Reclassify OFL as notice per cl/537072410 am: 166fa84e6a am: 2c93bf1691 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
e6e1657bb9 am: 9a8e659a5c am: 16ddfde621 am: 96bc766756 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/2611418 Change-Id: I595f006a5e848a739fde2a74dde0dfb1510ad7b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Reclassify OFL as notice per cl/537072410 am: 166fa84e6a am: 2c93bf1691 am: ↵Bob Badour
e6e1657bb9 am: 9a8e659a5c am: 16ddfde621 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/2611418 Change-Id: I5949ea252fc3a32e33b4ae6dc13d556ff8f69ca3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Reclassify OFL as notice per cl/537072410 am: 166fa84e6a am: 2c93bf1691 am: ↵Bob Badour
e6e1657bb9 am: 9a8e659a5c Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/2611418 Change-Id: Ie4136bc64b0373dd80f90202fb04d8bfe6c40504 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Reclassify OFL as notice per cl/537072410 am: 166fa84e6a am: 2c93bf1691 am: ↵Bob Badour
e6e1657bb9 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/2611418 Change-Id: I9cc2a2e49550228e21b5b3f35d03a9593201ce2d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Reclassify OFL as notice per cl/537072410 am: 166fa84e6a am: 2c93bf1691Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/2611418 Change-Id: I5777f2764befbd82313c17a7e8a783327ac11a5b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Reclassify OFL as notice per cl/537072410 am: 166fa84e6aBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/2611418 Change-Id: I8a7249d591a7167a59ee17f2d60d0913e5109bc6 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: Ia940248d692b316efb7f82419fbac7de9af3291d
2022-08-16Snap for 8952093 from 08c4c2c6e9b095993bf6fea9b791adc49468cf7c to sdk-releaseplatform-tools-34.0.3platform-tools-34.0.1platform-tools-34.0.0platform-tools-33.0.4platform-tools-33.0.3Android Build Coastguard Worker
Change-Id: I02b1432756be06f39c1900b4ffb030c19e75bccb
2022-06-29Snap for 8782634 from 525fa7d0364ff0e9dcc7b464838bdc0a752a7c9e to sdk-releaseAndroid Build Coastguard Worker
Change-Id: I4d33760bf7a17d5d9f394780c9a760bd0a9f5488
2022-05-08Snap for 8554636 from ecf968d0605b0b0b755c4cb3d85340e2bb832e48 to sdk-releaseplatform-tools-33.0.2Android Build Coastguard Worker
Change-Id: I2ddb4c1ad09837d98195d7c93012eedaa2fd48e5
2022-03-08Add license_note am: ecf968d060 am: 01218489cf am: 525fa7d036 am: 08c4c2c6e9 ↵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: cba8e73f67 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/2012162 Change-Id: I1b2dd0aa48737fea8ea9edebc99d5996c6e74c4c
2022-03-08Add license_note am: ecf968d060 am: 01218489cf am: 525fa7d036 am: 08c4c2c6e9Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/2012162 Change-Id: I30d7c8386d2905c7559bbb2dd6ae87f6aad19c0b
2022-03-08Add license_note am: ecf968d060 am: 01218489cf am: 525fa7d036 am: 08c4c2c6e9aml_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/karla/+/2012162 Change-Id: I9ffb9f3ccd2e4de9be8d3aff295175fb35876916
2022-03-08Add license_note am: ecf968d060 am: 01218489cf am: 525fa7d036t_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/karla/+/2012162 Change-Id: I6f247e34efce859216ca7aa7d45f074e37daeb6e
2022-03-08Add license_note am: ecf968d060 am: 01218489cfBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/2012162 Change-Id: I9ed8f5ce692fb7788395b8a377e96aa8050c9f75
2022-03-08Add license_note am: ecf968d060Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/2012162 Change-Id: I0b6003153ebe417caa8c30cce3cf71eb66a951b4
2022-03-07Add license_noteBob Badour
Comments not preserved during refresh. Bug: 68860345 Test: m nothing Change-Id: Id7584f90022ad17568856a8f14e66ca47631702d
2021-10-07Snap for 7800789 from 977d20636d82b7312d0cf3d1ba49e83fc582862f to sdk-releaseplatform-tools-33.0.1platform-tools-33.0.0platform-tools-32.0.0Android Build Coastguard Worker
Change-Id: I1b92eee27f562897776f0e51876be5973d455c48
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ic6cabb559f4011db8ce7c65bf94866326039792c
2021-05-29[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/karla am: 855061d376 ↵Bob Badour
am: 0a82c0c153 am: bcabd36e2d am: b81fb6b4c5 am: a2330e54d2 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1588697 Change-Id: I6d8a131c8c898a6588cc7bec81683c6dd9d35757
2021-03-04Snap for 7183507 from 04b7c3ad1fca69f28da65eeac9a902db1a4bc627 to sdk-releaseplatform-tools-31.0.3platform-tools-31.0.2platform-tools-31.0.1android-build-prod (mdb)
Change-Id: Ib5a370c424e1c6c87c7ea62714faab98eb9c1f2b
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 04b7c3ad1f -s ↵Xin Li
ours am: 10820fb3bb -s ours am: 977d20636d -s ours am skip reason: Change-Id Ib1f4f7a64d45ceff6b55a277af0cdd8dc883026d with SHA-1 f13ad4bb8b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I99f453d339bb13ac9a8c7001f046439d4b7a20ab
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 04b7c3ad1f -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: 10820fb3bb -s ours am: 977d20636d -s ours am skip reason: Change-Id Ib1f4f7a64d45ceff6b55a277af0cdd8dc883026d with SHA-1 f13ad4bb8b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I21bae50ec324dcfeac000f571da712467039f5dc
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 04b7c3ad1f -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: 10820fb3bb -s ours am skip reason: Change-Id Ib1f4f7a64d45ceff6b55a277af0cdd8dc883026d with SHA-1 f13ad4bb8b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7a4b004817095caabcba9b9ab600360e630290c6
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 04b7c3ad1f -s oursXin Li
am skip reason: Change-Id Ib1f4f7a64d45ceff6b55a277af0cdd8dc883026d with SHA-1 f13ad4bb8b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6dc966609f721b3f59c3cabf88226dc43e81c107
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: Ib1f4f7a64d45ceff6b55a277af0cdd8dc883026d Change-Id: Ibb5131aa886cb75a22bff8ca2c2a5349a1370a1f
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/karla am: 855061d376 ↵Bob Badour
am: 0a82c0c153 am: bcabd36e2d am: b81fb6b4c5 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1588697 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3e5120e2422b25fcfa6d5676ce6ab51eb3bd0763
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/karla am: 855061d376 ↵Bob Badour
am: 0a82c0c153 am: bcabd36e2d am: b81fb6b4c5 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1588697 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9d90d4aab5e03118b659126da631f7024931a02c
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/karla am: 855061d376 ↵Bob Badour
am: 0a82c0c153 am: bcabd36e2d Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1588697 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I669b5b719825b45f565ad94f321074ac5a020f61
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/karla am: 855061d376 ↵Bob Badour
am: 0a82c0c153 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1588697 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibdb378796c48eaa603a5627ceaf63a3b6b545f36
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/karla am: 855061d376Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1588697 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If3ec2f4e205ff0b2816dbe1807ebd2a7a29abff9
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/karlaandroid-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: I09f21e31c635c0cf51fe817507bba418c93b60ed
2021-01-29Snap for 7110675 from 065e95f785edb21c402687cfed2dd1dec90106eb to sdk-releaseplatform-tools-31.0.0android-build-prod (mdb)
Change-Id: I0ab01e8170405c04e51fd950ca66257afa100e0f
2020-12-10[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 065e95f785 -s ↵Xin Li
ours am: a88f262df8 -s ours am: f13ad4bb8b -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1520884 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1ef6f5459004ba6eb1739f21c68eb4ccfc5a0e9e
2020-12-10[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 065e95f785 -s ↵Xin Li
ours am: a88f262df8 -s ours am skip reason: Change-Id I52bfb3e6c7fb46fe70046a0db9b1c0de41a643e1 with SHA-1 c93e51eacf is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1520884 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib1f4f7a64d45ceff6b55a277af0cdd8dc883026d
2020-12-10[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 065e95f785 -s oursXin Li
am skip reason: Change-Id I52bfb3e6c7fb46fe70046a0db9b1c0de41a643e1 with SHA-1 c93e51eacf is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1520884 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id95a3dfe536041aedffb4af465e1d1eeff730c2d
2020-12-08DO NOT MERGE - Merge Android R QPR1Xin Li
Bug: 172690556 Merged-In: I52bfb3e6c7fb46fe70046a0db9b1c0de41a643e1 Change-Id: I49ab67ab08c920dd84bed21e02a8593f0f7879f7
2020-12-03[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ↵Xin Li
c93e51eacf -s ours am: 4bc4c9c361 -s ours am skip reason: Change-Id I72c68d007e8837b826b67502ece166714095ebf3 with SHA-1 2de1fb3e83 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/karla/+/13121544 Change-Id: I850325380ba4875a1529c6f3ca5ef2692f666420
2020-12-03[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ↵Xin Li
c93e51eacf -s ours am skip reason: Change-Id I72c68d007e8837b826b67502ece166714095ebf3 with SHA-1 2de1fb3e83 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/karla/+/13121544 Change-Id: I459e92ed7d50f1bcdf4c5621bb43523e4a76857d
2020-11-23Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855temp_rvc_qpr_mergeXin Li
Bug: 172690556 Merged-In: I72c68d007e8837b826b67502ece166714095ebf3 Change-Id: I52bfb3e6c7fb46fe70046a0db9b1c0de41a643e1
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 5b79c3ed2d -s ours ↵Xin Li
am: c76e282c6a -s ours am: 0847f76a2d -s ours am: 3c234306eb -s ours am skip reason: Change-Id I997f5f93b9221528d6e03d1a53e271cf40e2a060 with SHA-1 f90d8b3d84 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1465763 Change-Id: Idb0e73bf18c14b668e3090d202cee605d7f8ac10
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 5b79c3ed2d -s ours ↵Xin Li
am: c76e282c6a -s ours am: 0847f76a2d -s ours am skip reason: Change-Id I997f5f93b9221528d6e03d1a53e271cf40e2a060 with SHA-1 f90d8b3d84 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1465763 Change-Id: I884d807d5728761ef2a41df20c4fe84f276051b1
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 5b79c3ed2d -s ours ↵Xin Li
am: c76e282c6a -s ours am skip reason: Change-Id I997f5f93b9221528d6e03d1a53e271cf40e2a060 with SHA-1 f90d8b3d84 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1465763 Change-Id: I06a7ff1b5270aac0e2f168bf48033ddbf06134db
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 5b79c3ed2d -s oursXin Li
am skip reason: Change-Id I997f5f93b9221528d6e03d1a53e271cf40e2a060 with SHA-1 f90d8b3d84 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1465763 Change-Id: I0af781dc9aa6c4502966266ae1e8c66a992d7b19
2020-10-19Merge redfin/bramble support.Xin Li
Bug: 171218636 Merged-In: I997f5f93b9221528d6e03d1a53e271cf40e2a060 Change-Id: I0ff933545ace32a418eb643d8383de51e66a0d54
2020-10-13[automerger skipped] Merge ab/6749736 in stage. am: f90d8b3d84 -s ours am: ↵Xin Li
d2def5d9ba -s ours am: 1365443392 -s ours am skip reason: Change-Id I7fda30eb7ba4450dd524ff2e4084e562335eab03 with SHA-1 5d22d2d3ef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/karla/+/12804431 Change-Id: I817b690a56c0d1313e3b1e158c604cce4a5a442a
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 07:43:52 +0000