aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-02Snap for 11400057 from cc3310cc45444c73841e45133c11f9919bf3da40 to ↵simpleperf-releaseAndroid Build Coastguard Worker
simpleperf-release Change-Id: I0fba7e2537532e2049564b0a824ca05d904a0f97
2023-10-16Snap for 10957012 from 42267f0f1ef3c25afc8a8160eb2136d45e73157d to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I4a56c55a0c6d8242f58971062478aa082118e8ae
2023-07-20Snap for 10448490 from 34117ee4f38426f48b36b1c15e65f2c26023b400 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I996658e27978b328878138cb14c22fe7bd80b348
2023-06-12Snap for 10306048 from 9505c6e369fa847288b265f00fc438f2e0756612 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I3ed0ab055632304857ef239c8702d4d81899ba8b
2023-06-08Reclassify OFL as notice per cl/537072410 am: 9505c6e369 am: 34117ee4f3 am: ↵Bob Badour
4ee2df8143 am: 42267f0f1e am: 57e3379072 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/2612250 Change-Id: I69b3d07cdcfd6c155f21885e2d5148a141d940cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Reclassify OFL as notice per cl/537072410 am: 9505c6e369 am: 34117ee4f3 am: ↵Bob Badour
4ee2df8143 am: 42267f0f1e Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/2612250 Change-Id: I1d7d1242f64002244b85abc5030dcf1dd0203c94 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Reclassify OFL as notice per cl/537072410 am: 9505c6e369 am: 34117ee4f3 am: ↵Bob Badour
4ee2df8143 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/2612250 Change-Id: I73d132f1357f79a17b43f01f1ff5f75a96caa44d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Reclassify OFL as notice per cl/537072410 am: 9505c6e369 am: 34117ee4f3Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/2612250 Change-Id: Ibc30dc0dbab91ba299790ca26f01d9cdbd0e7dcc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-08Reclassify OFL as notice per cl/537072410 am: 9505c6e369Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/2612250 Change-Id: I131a42d91472ec41421f43b880e2fd611da2ee53 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: I5c8d5671495019fed1f41b2fb027949b94eb185c
2022-09-02Snap for 9023430 from 5e881e067d392e057c26fb17c3d22021f53040cc to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I688713995699fac191759e32f77f067514e98966
2022-03-23Snap for 8346178 from 08d84a6bfbdff1ddf584b497fc3c63ce8731c276 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I324a112fca690b2eba5dd1e616993b0b2de602ce
2022-03-08Add license_note am: 08d84a6bfb am: 5420aff906 am: 81c5e6e55b am: 5e881e067d ↵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: 074e51aac0 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/2012336 Change-Id: I6d4943b6d5d912a8228da48741c43642fd0055d3
2022-03-08Add license_note am: 08d84a6bfb am: 5420aff906 am: 81c5e6e55b am: 5e881e067daml_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/big-shoulders-text/+/2012336 Change-Id: Ic0939462bf302482f75f8840fd25c4dfcea8dcd9
2022-03-08Add license_note am: 08d84a6bfb am: 5420aff906 am: 81c5e6e55b am: 5e881e067dBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/2012336 Change-Id: I0ee76c09532cf2ded341558876ad39dc0ead0961
2022-03-08Add license_note am: 08d84a6bfb am: 5420aff906 am: 81c5e6e55bt_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/big-shoulders-text/+/2012336 Change-Id: Ica76a3373ecb373167b178731c2d0362482758aa
2022-03-08Add license_note am: 08d84a6bfb am: 5420aff906Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/2012336 Change-Id: I2b4bfd95f74c710ef45539f7b5740c6c5ebf4381
2022-03-08Add license_note am: 08d84a6bfbBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/2012336 Change-Id: I88d0c8aaf6c023fd171e0f61d73652d93c40fd70
2022-03-07Add license_noteBob Badour
Comments not preserved during refresh. Bug: 68860345 Test: m nothing Change-Id: I534a5611df5281e85320c508db4b4d170ac7de03
2021-10-12Snap for 7817384 from b36e3523d5886d4625306f31f157f705a79ce840 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: Id1d2dc401874003f2029ef551e686d7eb271e731
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I15611871744bcfb7d5d0007f8e202ff80ff5c109
2021-05-29[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/big-shoulders-text ↵Bob Badour
am: 2a67950c99 am: 8f657b8faf am: d2b73ff27b am: d328df3e7f am: 6447a7a3c2 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/1588696 Change-Id: I6e2b23867f5803828e589ab7eb008c94be5e1507
2021-03-15Snap for 7209783 from 230998df454b3ceb1eea2d5d64c07bfb15fc53fd to ↵android-build-prod (mdb)
simpleperf-release Change-Id: I2a1519c487ec2d9c72d6fe75b566c0c0f9888ef1
2021-02-24Snap for 7168215 from 2a67950c997bf83a1d07d48164319ec861028407 to ↵android-build-prod (mdb)
simpleperf-release Change-Id: Ib8f4db69ce8d348e18425c0e47b6d3c17bc0929c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 230998df45 -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: c47b00bdb7 -s ours am: b36e3523d5 -s ours am skip reason: Change-Id I17d1e4e64e11374002fad5dacee56d633fbc2dbf with SHA-1 5c8588bd5c is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0527eb8ec3a427e37be3e5d52ae7cd2420c4f815
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 230998df45 -s ↵Xin Li
ours am: c47b00bdb7 -s ours am: b36e3523d5 -s ours am skip reason: Change-Id I17d1e4e64e11374002fad5dacee56d633fbc2dbf with SHA-1 5c8588bd5c is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I836cc16c40e5960f78020c632dad4c7ee1d0746c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 230998df45 -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: c47b00bdb7 -s ours am skip reason: Change-Id I17d1e4e64e11374002fad5dacee56d633fbc2dbf with SHA-1 5c8588bd5c is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia13a416f5a35da12f7c3f8853c7ad818f047fbd1
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 230998df45 -s oursXin Li
am skip reason: Change-Id I17d1e4e64e11374002fad5dacee56d633fbc2dbf with SHA-1 5c8588bd5c is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ica35277823b0bdc4b0d97679e1efd4ac322c1ebd
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: I17d1e4e64e11374002fad5dacee56d633fbc2dbf Change-Id: I8f635e7dd54a113ae02c17e53dc5150dfbe5e7ad
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/big-shoulders-text ↵Bob Badour
am: 2a67950c99 am: 8f657b8faf am: d2b73ff27b am: d328df3e7f Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/1588696 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie79bf2af97583667ffdf3f0feb32036c683c0dfd
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/big-shoulders-text ↵Bob Badour
am: 2a67950c99 am: 8f657b8faf am: d2b73ff27b am: d328df3e7f Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/1588696 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibc03ddade43a55621f72c3c4f9766253aa91b3f4
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/big-shoulders-text ↵Bob Badour
am: 2a67950c99 am: 8f657b8faf am: d2b73ff27b Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/1588696 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If26b2edd74b153726d7b6ce0a3a1909ad0146891
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/big-shoulders-text ↵Bob Badour
am: 2a67950c99 am: 8f657b8faf Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/1588696 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib8167f84107b16b8d62e3997558b1af4f3203e96
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/big-shoulders-text ↵Bob Badour
am: 2a67950c99 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/1588696 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I803c7cf52fd58a99d0963fdcc3db224037c87068
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/big-shoulders-textandroid-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: I44be161dc4510b4039184709fcb9f023bcc63c13
2021-02-01Snap for 7116807 from d816527c320cc62f6d9c111b87bd65029b3a75a9 to ↵android-build-prod (mdb)
simpleperf-release Change-Id: I717a612aa216c1f05d13a7ca0a9d961b90758f72
2020-12-10[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: d816527c32 -s ↵Xin Li
ours am: e21bb478ba -s ours am: 5c8588bd5c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/1521184 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7c2c8be9e79f152b869b893eae44045eb8cbad16
2020-12-10[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: d816527c32 -s ↵Xin Li
ours am: e21bb478ba -s ours am skip reason: Change-Id I17602e470cf1600f0321a715dceff543c220b5f0 with SHA-1 ecda196797 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/1521184 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I17d1e4e64e11374002fad5dacee56d633fbc2dbf
2020-12-10[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: d816527c32 -s oursXin Li
am skip reason: Change-Id I17602e470cf1600f0321a715dceff543c220b5f0 with SHA-1 ecda196797 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/1521184 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id6eb1809e78ed806a764ec5fa467e4a0a15bdcb4
2020-12-08DO NOT MERGE - Merge Android R QPR1Xin Li
Bug: 172690556 Merged-In: I17602e470cf1600f0321a715dceff543c220b5f0 Change-Id: I9304edd92528fc5cdc3a05003e3baca1623ae7ad
2020-12-03[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ↵Xin Li
ecda196797 -s ours am: c7c92898cb -s ours am skip reason: Change-Id Icbcbce7c8657e6424c3a98f5c4ee388a793122ae with SHA-1 60aea0a1ff is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/13120524 Change-Id: I035dc09d0966115ba0c2491570f22216a418d126
2020-12-03[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ↵Xin Li
ecda196797 -s ours am skip reason: Change-Id Icbcbce7c8657e6424c3a98f5c4ee388a793122ae with SHA-1 60aea0a1ff is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/13120524 Change-Id: I357d8aed0f219b9e265c2d568565c8c2142237a5
2020-11-30Snap for 7002008 from 20868ae812a252d7b16e40841847085126875706 to ↵android-build-prod (mdb)
simpleperf-release Change-Id: I04ac4fb31a26d7854d9de8e2cc7a5de7514f28e6
2020-11-23Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855temp_rvc_qpr_mergeXin Li
Bug: 172690556 Merged-In: Icbcbce7c8657e6424c3a98f5c4ee388a793122ae Change-Id: I17602e470cf1600f0321a715dceff543c220b5f0
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 20868ae812 -s ours ↵Xin Li
am: 104f4f7ce8 -s ours am: 0353de6bc1 -s ours am: 37cfc4d9c2 -s ours am skip reason: Change-Id I178fe79b2c04e7ab0786a92c3d6b780f1e3dd1d7 with SHA-1 08103b7215 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/1465930 Change-Id: Ifbaacbfd5e4f054d76f091a599d2d32c64141997
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 20868ae812 -s ours ↵Xin Li
am: 104f4f7ce8 -s ours am: 0353de6bc1 -s ours am skip reason: Change-Id I178fe79b2c04e7ab0786a92c3d6b780f1e3dd1d7 with SHA-1 08103b7215 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/1465930 Change-Id: I1d211c7f4552eed96f4be9a3915cb763dbe51e10
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 20868ae812 -s ours ↵Xin Li
am: 104f4f7ce8 -s ours am skip reason: Change-Id I178fe79b2c04e7ab0786a92c3d6b780f1e3dd1d7 with SHA-1 08103b7215 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/1465930 Change-Id: I5d80a5a986e2714846f8ba527d9697aee04b6638
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 20868ae812 -s oursXin Li
am skip reason: Change-Id I178fe79b2c04e7ab0786a92c3d6b780f1e3dd1d7 with SHA-1 08103b7215 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/1465930 Change-Id: I3eee88f6b81edfbc04ab4ad2e67847e2ece85763
2020-10-19Merge redfin/bramble support.Xin Li
Bug: 171218636 Merged-In: I178fe79b2c04e7ab0786a92c3d6b780f1e3dd1d7 Change-Id: Ic063a80037e5758cbb79dcce36e56c54b33ffd71
2020-10-13[automerger skipped] Merge ab/6749736 in stage. am: 08103b7215 -s ours am: ↵Xin Li
fd66cc357c -s ours am: 30c05147c6 -s ours am skip reason: Change-Id I29bbdc47a1e66d8703263794bc1940d7d5dd8e2e with SHA-1 b28d877934 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/12804464 Change-Id: Idb4b057199b192c4b353dc8514d3ab42af600761