aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-07Snap for 10453563 from 23d21ef544c4a665a2b254c13860a569d156b05f to ↵aml_sta_341615000aml_sta_341511040aml_sta_341410000aml_sta_341311010aml_sta_341114000aml_sta_341111000aml_sta_341010020aml_sta_340912000aml_sta_340911000aml_net_341111030android14-mainline-os-statsd-releaseAndroid Build Coastguard Worker
mainline-os-statsd-release Change-Id: Id0a629d5ff6074f9ef53c70e7334a6dd17cabfff
2022-05-10Snap for 8564071 from f741937ceddeb36bb19636c72e0c89b2596ce060 to ↵aml_sta_331910000aml_sta_331811000aml_sta_331711010aml_sta_331610000aml_sta_331511000aml_sta_331410000aml_sta_331311000aml_sta_331010010aml_sta_330910000android13-mainline-os-statsd-releaseAndroid Build Coastguard Worker
mainline-os-statsd-release Change-Id: I277c4b6b44eb26f4c590c0faa929a381b9c84c4f
2022-03-08Add license_note am: cf9316bc97 am: fe0cfda6fb am: cb2638d57c am: 84770b5854 ↵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_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: f741937ced Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/2011748 Change-Id: I35d981ea0ade6d082530de68a1186a77a15c3ba3
2022-03-08Add license_note am: cf9316bc97 am: fe0cfda6fb am: cb2638d57c am: 84770b5854Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/2011748 Change-Id: I24b7848096a8985495df55c0f423cd6a80e57298
2022-03-08Add license_note am: cf9316bc97 am: fe0cfda6fb am: cb2638d57c am: 84770b5854aml_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/fraunces/+/2011748 Change-Id: I78edfcc44cfedb5285f098dba63721da3ff95268
2022-03-08Add license_note am: cf9316bc97 am: fe0cfda6fb am: cb2638d57ct_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/fraunces/+/2011748 Change-Id: Idabc62c8bad56c726966548438997821a9c329bf
2022-03-08Add license_note am: cf9316bc97 am: fe0cfda6fbBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/2011748 Change-Id: Icb882c6c6375bb94a74acf5c0447b8dcbc44b3d7
2022-03-08Add license_note am: cf9316bc97Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/2011748 Change-Id: Idd62f9dd3bd24da5bd06e1658ee25b9cde3bb415
2022-03-07Add license_noteBob Badour
Comments not preserved during refresh. Bug: 68860345 Test: m nothing Change-Id: Ic917fc8fb743595d9769a31745916e1e76eb3d59
2021-07-15Snap for 7550844 from 924d0397ad9965bbc5370c6bf1bfbec7b62f0d69 to ↵android-mainline-12.0.0_r84android-mainline-12.0.0_r58android12-mainline-statsd-releaseAndroid Build Coastguard Worker
mainline-os-statsd-release Change-Id: I5186266fd034d10979f536062a889d3b074708e9
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ib1cdb4b2fc669f9b85bb096fb9b7992282cb2a7c
2021-05-29[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/fraunces am: ↵Bob Badour
2c1b5c8d8c am: dffd3baa2c am: 3596a88d60 am: 53d640fcd7 am: 430a72703c Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1588660 Change-Id: Iaa4c53b40ad590950df81f2ac3d002737bf44081
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6882553d74 -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: 2ca5d8a437 -s ours am: d253b7159a -s ours am skip reason: Change-Id I20595bd3406ce31f03d3c0cddc8bb95e7ca9c4f9 with SHA-1 7ed5a4dc8f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic154a0d2dbfe8e59cbdde91537f118f97a0b55f9
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6882553d74 -s ↵Xin Li
ours am: 2ca5d8a437 -s ours am: d253b7159a -s ours am skip reason: Change-Id I20595bd3406ce31f03d3c0cddc8bb95e7ca9c4f9 with SHA-1 7ed5a4dc8f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0187fa19c5b6524b6aa18ec0dac2073418a0cdd2
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6882553d74 -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: 2ca5d8a437 -s ours am skip reason: Change-Id I20595bd3406ce31f03d3c0cddc8bb95e7ca9c4f9 with SHA-1 7ed5a4dc8f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2438eecbabc87e07ab1a709fe4d7ff160d27ba79
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6882553d74 -s oursXin Li
am skip reason: Change-Id I20595bd3406ce31f03d3c0cddc8bb95e7ca9c4f9 with SHA-1 7ed5a4dc8f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I63351b73bdf949cdcd8e0fa4e5bad79b52b0e2ff
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: I20595bd3406ce31f03d3c0cddc8bb95e7ca9c4f9 Change-Id: Ib4979046043129b5cb7e3c7450847cabf53cb0a6
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/fraunces am: ↵Bob Badour
2c1b5c8d8c am: dffd3baa2c am: 3596a88d60 am: 53d640fcd7 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1588660 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If24d32ae70fba78bde33f9b986fed2d98fa69244
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/fraunces am: ↵Bob Badour
2c1b5c8d8c am: dffd3baa2c am: 3596a88d60 am: 53d640fcd7 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1588660 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7a38bcabd010566808594cee51667c5df15e43e1
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/fraunces am: ↵Bob Badour
2c1b5c8d8c am: dffd3baa2c am: 3596a88d60 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1588660 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5b468091036e941f51b5fdb0fbbdb71dda40ed11
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/fraunces am: ↵Bob Badour
2c1b5c8d8c am: dffd3baa2c Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1588660 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I95044fdb0c369c93725a3e72c788520c7e8c7fdf
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/fraunces am: 2c1b5c8d8cBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1588660 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifd2e6a616bd6e1d5639b14cd536b06e50ac814b7
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/frauncesandroid-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: I7a54d33334fa3f3dff0738e6c09e5f2d89b5cc42
2020-11-24Mark ab/6881855 as merged am: 3647f69281 am: 7ed5a4dc8fXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/13112758 Change-Id: Id801fdcbf28a68e189480c12f5dafbd4dcf882da
2020-11-24Mark ab/6881855 as merged am: 3647f69281Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/13112758 Change-Id: I20595bd3406ce31f03d3c0cddc8bb95e7ca9c4f9
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ie53a0f132c6576647a54de9ea6ce34b72d3944c6
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 9403909a58 -s ours ↵Xin Li
am: e866bdd79d -s ours am: bf075590e6 -s ours am: 6c41ba3db1 -s ours am skip reason: Change-Id I782dbed16ee6ce69665380c0d8b801f62ed2cd4b with SHA-1 5ca07135eb is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1466366 Change-Id: Ic2c102a3cdf223a1b7ec5a68c2aaa40a17777547
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 9403909a58 -s ours ↵Xin Li
am: e866bdd79d -s ours am: bf075590e6 -s ours am skip reason: Change-Id I782dbed16ee6ce69665380c0d8b801f62ed2cd4b with SHA-1 5ca07135eb is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1466366 Change-Id: Iefb060b46f0df72a08f8c3c6c3c3a91e3b436a99
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 9403909a58 -s ours ↵Xin Li
am: e866bdd79d -s ours am skip reason: Change-Id I782dbed16ee6ce69665380c0d8b801f62ed2cd4b with SHA-1 5ca07135eb is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1466366 Change-Id: I311bf5c305eaf0c5d60aa74a4f391657611ac37e
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 9403909a58 -s oursXin Li
am skip reason: Change-Id I782dbed16ee6ce69665380c0d8b801f62ed2cd4b with SHA-1 5ca07135eb is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1466366 Change-Id: If4fe7aa0897d494ca521c73fed0e45bff7e16a4b
2020-10-19Merge redfin/bramble support.Xin Li
Bug: 171218636 Merged-In: I782dbed16ee6ce69665380c0d8b801f62ed2cd4b Change-Id: I8aabdcf04fb8b4bc4faa8b280a9c62c786b1fd7c
2020-10-13[automerger skipped] Merge ab/6749736 in stage. am: 5ca07135eb -s ours am: ↵Xin Li
44cc05aadb -s ours am: 451f6a921c -s ours am skip reason: Change-Id I5dd32cab862873deb9cc40f38443676a43e8e95f with SHA-1 38a8eebb60 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/12804167 Change-Id: I82138e2d4f263a677b468267498b145bda942026
2020-10-13[automerger skipped] Merge ab/6749736 in stage. am: 5ca07135eb -s ours am: ↵Xin Li
44cc05aadb -s ours am skip reason: Change-Id I5dd32cab862873deb9cc40f38443676a43e8e95f with SHA-1 38a8eebb60 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/12804167 Change-Id: Iff8b15c274d1f5454576b8c7b0db4527399f6cc6
2020-10-13[automerger skipped] Merge ab/6749736 in stage. am: 5ca07135eb -s oursXin Li
am skip reason: Change-Id I5dd32cab862873deb9cc40f38443676a43e8e95f with SHA-1 38a8eebb60 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/12804167 Change-Id: Ib96408438831491bc8d33cdbfd292d413bfd6ed9
2020-10-09Merge ab/6749736 in stage.Xin Li
Bug: 167233921 Merged-In: I5dd32cab862873deb9cc40f38443676a43e8e95f Change-Id: I782dbed16ee6ce69665380c0d8b801f62ed2cd4b
2020-09-21[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: 463be1d0c1 am: 0936a1c8c6 -s ours am: 6640f8698f -s ours am: 4821dd51b4 -s ours am: fc9f563051 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1431514 Change-Id: I9ae0b3b01bf13fa5a4df06e42f644e06697b8e68
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: 463be1d0c1 am: 0936a1c8c6 -s ours am: 6640f8698f -s ours am: 4821dd51b4 -s ours am skip reason: Change-Id Ia5f1758ee7036f5d18a2216b383854b9c2412fae with SHA-1 22573bf6d6 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1431514 Change-Id: I50426337632f43698b930c3aa3740bdf35791929
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: 463be1d0c1 am: 0936a1c8c6 -s ours am: 6640f8698f -s ours am skip reason: Change-Id Ia5f1758ee7036f5d18a2216b383854b9c2412fae with SHA-1 22573bf6d6 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1431514 Change-Id: Ie143e7f70bd1323cc66a445d6d09ab6e3874a479
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: 463be1d0c1 am: 0936a1c8c6 -s ours am skip reason: Change-Id Ia5f1758ee7036f5d18a2216b383854b9c2412fae with SHA-1 22573bf6d6 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1431514 Change-Id: I02f0800880b3629be78d9e4656ac6da705b0c82e
2020-09-19Merge mainline-release 6664920 to master - DO NOT MERGE am: 463be1d0c1Bill Yi
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1431514 Change-Id: I0d81bf1f113072801eb484c668e923ae37449350
2020-09-17Merge mainline-release 6664920 to master - DO NOT MERGEplatform-tools-30.0.5Bill Yi
Merged-In: Ia5f1758ee7036f5d18a2216b383854b9c2412fae Change-Id: Iccf21e92087a849f85022b0b19996d8c1f09347f
2020-09-15[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: eb4040cfac -s ours am: 22573bf6d6 -s ours am: 4225f9d79a -s ours am: 4b08ef1c09 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/12579277 Change-Id: Ie96cfd97d5f69d896e070d33da0eb9808492486f
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: eb4040cfac -s ours am: 22573bf6d6 -s ours am: 4225f9d79a -s ours am skip reason: Change-Id I2c587dc8fda0c48f07569b3f8ddd44a8825a2a54 with SHA-1 5c2dd362eb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/12579277 Change-Id: I082979a8aa851ee178576558cae6ff4dd8c89259
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: eb4040cfac -s ours am: 22573bf6d6 -s ours am skip reason: Change-Id I2c587dc8fda0c48f07569b3f8ddd44a8825a2a54 with SHA-1 5c2dd362eb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/12579277 Change-Id: If8f85cb78e461e220afcbb78f5d5e799ab57842c
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: eb4040cfac -s ours am skip reason: Change-Id I2c587dc8fda0c48f07569b3f8ddd44a8825a2a54 with SHA-1 5c2dd362eb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/12579277 Change-Id: Ia5f1758ee7036f5d18a2216b383854b9c2412fae
2020-09-13Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGEBill Yi
Merged-In: I2c587dc8fda0c48f07569b3f8ddd44a8825a2a54 Change-Id: I7da3fab5272933bbd6d07fcdaab4e1cfe9645ea6
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 88266c030a -s ours am: 5c2dd362eb -s ours am: de0b3ac58c -s ours am: 23c6fb2e8c -s ours am skip reason: Change-Id Ibf8471634da6ec3333cda0c0a913cbf70ac8340a with SHA-1 5059f21113 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/12470111 Change-Id: Id732517f53a3cb2c76617742add31c5301bd0c69
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 88266c030a -s ours am: 5c2dd362eb -s ours am: de0b3ac58c -s ours am skip reason: Change-Id Ibf8471634da6ec3333cda0c0a913cbf70ac8340a with SHA-1 5059f21113 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/12470111 Change-Id: If8deb171adef2b1d87661a76d1fb36ace9da02f5
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 88266c030a -s ours am: 5c2dd362eb -s ours am skip reason: Change-Id Ibf8471634da6ec3333cda0c0a913cbf70ac8340a with SHA-1 5059f21113 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/12470111 Change-Id: Ib88c6ce4de41f20058d9a8165c215be32952a5f1
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 88266c030a -s ours am skip reason: Change-Id Ibf8471634da6ec3333cda0c0a913cbf70ac8340a with SHA-1 5059f21113 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/12470111 Change-Id: I2c587dc8fda0c48f07569b3f8ddd44a8825a2a54