summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-04-06Merge "[automerger skipped] 2nd attempt of update Roboto font to 3.005 am: ↵HEADandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29mastermainandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAutomerger Merge Worker
5ea6152c40 am: dfcd126e11 am: 9c31f21a87 -s ours am: 56a1a2eb26 -s ours am: 192e5aaa9e -s ours"
2023-04-06[automerger skipped] 2nd attempt of update Roboto font to 3.005 am: ↵Seigo Nonaka
5ea6152c40 am: dfcd126e11 am: 9c31f21a87 -s ours am: 56a1a2eb26 -s ours am: 192e5aaa9e -s ours am skip reason: Merged-In I807431e5a5a87d4ecc045f8ad93601e244ac1f18 with SHA-1 3e4e9857bc is already in history Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2524258 Change-Id: I6ebbe603a61c849fbfd5bceac8f54ab52af6fb3c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06[automerger skipped] 2nd attempt of update Roboto font to 3.005 am: ↵Seigo Nonaka
5ea6152c40 am: dfcd126e11 am: 9c31f21a87 -s ours am: 56a1a2eb26 -s ours am: 3d6742863b -s ours am skip reason: Merged-In I807431e5a5a87d4ecc045f8ad93601e244ac1f18 with SHA-1 3e4e9857bc is already in history Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2524258 Change-Id: Ifff59dac623427d72f01f6dc0850e979876a73ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06[automerger skipped] 2nd attempt of update Roboto font to 3.005 am: ↵android-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_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseSeigo Nonaka
5ea6152c40 am: dfcd126e11 am: 9c31f21a87 -s ours am: 56a1a2eb26 -s ours am skip reason: Merged-In I807431e5a5a87d4ecc045f8ad93601e244ac1f18 with SHA-1 3e4e9857bc is already in history Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2524258 Change-Id: Ia62ec5491f1749ef7d57e2d133fe092121f453cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06[automerger skipped] 2nd attempt of update Roboto font to 3.005 am: ↵Seigo Nonaka
5ea6152c40 am: dfcd126e11 am: 9c31f21a87 -s ours am: 56a1a2eb26 -s ours am skip reason: Merged-In I807431e5a5a87d4ecc045f8ad93601e244ac1f18 with SHA-1 3e4e9857bc is already in history Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2524258 Change-Id: I535d03bf0a3ee49717208bf4a565ee7901ae86b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06[automerger skipped] 2nd attempt of update Roboto font to 3.005 am: ↵android14-devSeigo Nonaka
5ea6152c40 am: dfcd126e11 am: 9c31f21a87 -s ours am skip reason: Merged-In I807431e5a5a87d4ecc045f8ad93601e244ac1f18 with SHA-1 3e4e9857bc is already in history Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2524258 Change-Id: I4fd541ced726d7fd1fbf1a2b7e76b3990653fe15 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-062nd attempt of update Roboto font to 3.005 am: 5ea6152c40 am: dfcd126e11Seigo Nonaka
Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2524258 Change-Id: I92aa36b2fca3f74d11a0397d56a3063cef34b1b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-062nd attempt of update Roboto font to 3.005 am: 5ea6152c40Seigo Nonaka
Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2524258 Change-Id: I9a9b9f064a23b2ff2e31f688d41c157e8dd31efa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-052nd attempt of update Roboto font to 3.005android-u-beta-1-gplSeigo Nonaka
The previous revert was due to fonts.xml difference between AOSP and UDC. The RobotoStatic-Regular.ttf is no longer used in UDC branch but still used in AOSP. So, removing RobotoStatic-Regular.ttf from the update target should not break the test again. Bug: 273148054 Test: N/A Change-Id: I807431e5a5a87d4ecc045f8ad93601e244ac1f18 Merged-In: I807431e5a5a87d4ecc045f8ad93601e244ac1f18
2023-03-22[automerger skipped] Revert "Update Roboto font to 3.005" am: a781a17290 am: ↵Devin Moore
1e6b634db7 am: c46dd13195 -s ours am: 2736468092 -s ours am: ecff457a59 -s ours am skip reason: Merged-In If3652dd438fa2d82d961fc79d85e76627db897b9 with SHA-1 2721fa12e3 is already in history. Merged-In was found from reverted change. Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2501136 Change-Id: If99bc8d5759c55ce0bc13ae978440c767f2bc227 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22[automerger skipped] Revert "Update Roboto font to 3.005" am: a781a17290 am: ↵Devin Moore
1e6b634db7 am: c46dd13195 -s ours am: 2736468092 -s ours am skip reason: Merged-In If3652dd438fa2d82d961fc79d85e76627db897b9 with SHA-1 2721fa12e3 is already in history. Merged-In was found from reverted change. Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2501136 Change-Id: Ic18e7cdb3e302640f62463a09151df7cd4fcb153 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22[automerger skipped] Revert "Update Roboto font to 3.005" am: a781a17290 am: ↵Devin Moore
1e6b634db7 am: c46dd13195 -s ours am: 2736468092 -s ours am: cbcebec1bc -s ours am skip reason: Merged-In If3652dd438fa2d82d961fc79d85e76627db897b9 with SHA-1 2721fa12e3 is already in history. Merged-In was found from reverted change. Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2501136 Change-Id: I15571636f91bea3c800893e5ddb89349d194251f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22[automerger skipped] Revert "Update Roboto font to 3.005" am: a781a17290 am: ↵Devin Moore
1e6b634db7 am: c46dd13195 -s ours am: 2736468092 -s ours am skip reason: Merged-In If3652dd438fa2d82d961fc79d85e76627db897b9 with SHA-1 2721fa12e3 is already in history. Merged-In was found from reverted change. Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2501136 Change-Id: I11eda719e58a6441c22b472c2d48ca05a57127a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22[automerger skipped] Revert "Update Roboto font to 3.005" am: a781a17290 am: ↵Devin Moore
1e6b634db7 am: c46dd13195 -s ours am skip reason: Merged-In If3652dd438fa2d82d961fc79d85e76627db897b9 with SHA-1 2721fa12e3 is already in history. Merged-In was found from reverted change. Reverted change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2484977 Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2501136 Change-Id: If93609cd34337f217705262f3e8a053f0adfe0ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22Revert "Update Roboto font to 3.005" am: a781a17290 am: 1e6b634db7Devin Moore
Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2501136 Change-Id: I29a5135b452dc3225b3dd7839f9095ff775cc474 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22Revert "Update Roboto font to 3.005" am: a781a17290Devin Moore
Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2501136 Change-Id: Ic67ec663d29d019fc72077cd4c353f522661fed2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21Revert "Update Roboto font to 3.005"Devin Moore
This reverts commit f5cf4162b5e73c7c0c85b069eb1f642fb44e3e9e. Reason for revert: b/273689652 Change-Id: Iae38208f2507fd8ee2fe92a1c13dc8fa404238c9
2023-03-172nd attempt of update Roboto font to 3.005 am: 3e4e9857bc am: b465325b6aSeigo Nonaka
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/roboto-fonts/+/22106284 Change-Id: I6514e563bc5c0c6d02ea62edfc62cfc59f91231d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-172nd attempt of update Roboto font to 3.005 am: 3e4e9857bc am: f2246dfacaSeigo Nonaka
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/roboto-fonts/+/22106284 Change-Id: I97f8c65e32ca2fb5c1c0248826418c530586230c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-172nd attempt of update Roboto font to 3.005 am: 3e4e9857bcSeigo Nonaka
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/roboto-fonts/+/22106284 Change-Id: I8cf6db080917c58a0c64ea56b4648ee8cfc48c58 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-172nd attempt of update Roboto font to 3.005 am: 3e4e9857bcSeigo Nonaka
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/roboto-fonts/+/22106284 Change-Id: I0a57cb501e542b2fdc051da32665f36db62944e4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-162nd attempt of update Roboto font to 3.005Seigo Nonaka
The previous revert was due to fonts.xml difference between AOSP and UDC. The RobotoStatic-Regular.ttf is no longer used in UDC branch but still used in AOSP. So, removing RobotoStatic-Regular.ttf from the update target should not break the test again. Bug: 273148054 Test: N/A Change-Id: I807431e5a5a87d4ecc045f8ad93601e244ac1f18
2023-03-15Merge "Revert "Update Roboto font to 3.005"" into udc-dev am: 8a19f19601 am: ↵András Kurucz
bb0e224cab Original change: https://googleplex-android-review.googlesource.com/c/platform/external/roboto-fonts/+/22099982 Change-Id: I17c82cad0139ca34690de2c71d829c5ae0fb6e94 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15Merge "Revert "Update Roboto font to 3.005"" into udc-dev am: 8a19f19601 am: ↵András Kurucz
f33de78921 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/roboto-fonts/+/22099982 Change-Id: I9e341aae191249e35faa422e2cd033fd2a8ad954 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15Merge "Revert "Update Roboto font to 3.005"" into udc-dev am: 8a19f19601András Kurucz
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/roboto-fonts/+/22099982 Change-Id: I6d241048cf338c5ccc3275e16cfdb9d81cf1ef57 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15Merge "Revert "Update Roboto font to 3.005"" into udc-dev am: 8a19f19601András Kurucz
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/roboto-fonts/+/22099982 Change-Id: I5d1d3155f15a9c460be86a7e994eb2ae309bac33 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15Merge "Revert "Update Roboto font to 3.005"" into udc-devAndrás Kurucz
2023-03-15Revert "Update Roboto font to 3.005"András Kurucz
This reverts commit 2721fa12e326d2075fc0551e1fe42e28baf9b454. Reason for revert: it is possibly breaking the test android.text.LayoutTest.LayoutTest#testGetSelectionWithMultilineSelection_secondLineSelectionEndsBeforeFirstCharacter Bug: 273689652 Change-Id: I7147fa3764cd160d80878c98ace2b00f7fb67ad7
2023-03-15[automerger skipped] Update Roboto font to 3.005 am: f5cf4162b5 am: ↵Seigo Nonaka
4f3939d55a am: 3f6a241222 -s ours am: 99f20e3b5e -s ours am: 3389952018 -s ours am skip reason: Merged-In If3652dd438fa2d82d961fc79d85e76627db897b9 with SHA-1 2721fa12e3 is already in history Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2484977 Change-Id: Ic92be4aed70b2dcabb9545eae2078f3e1d4bedf1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Update Roboto font to 3.005 am: f5cf4162b5 am: ↵Seigo Nonaka
4f3939d55a am: 3f6a241222 -s ours am: 99f20e3b5e -s ours am: 0230635308 -s ours am skip reason: Merged-In If3652dd438fa2d82d961fc79d85e76627db897b9 with SHA-1 2721fa12e3 is already in history Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2484977 Change-Id: Ic2465bec2b77c8886adf6b1824e0fe8909c79da2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Update Roboto font to 3.005 am: f5cf4162b5 am: ↵Seigo Nonaka
4f3939d55a am: 3f6a241222 -s ours am: 99f20e3b5e -s ours am skip reason: Merged-In If3652dd438fa2d82d961fc79d85e76627db897b9 with SHA-1 2721fa12e3 is already in history Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2484977 Change-Id: I45e01c36a234842a4c2d0cdb37cad178b133fef4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Update Roboto font to 3.005 am: f5cf4162b5 am: ↵Seigo Nonaka
4f3939d55a am: 3f6a241222 -s ours am: 99f20e3b5e -s ours am skip reason: Merged-In If3652dd438fa2d82d961fc79d85e76627db897b9 with SHA-1 2721fa12e3 is already in history Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2484977 Change-Id: I400cd03ba5ca80470cf33019e53f7e942af074c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Update Roboto font to 3.005 am: f5cf4162b5 am: ↵Seigo Nonaka
4f3939d55a am: 3f6a241222 -s ours am skip reason: Merged-In If3652dd438fa2d82d961fc79d85e76627db897b9 with SHA-1 2721fa12e3 is already in history Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2484977 Change-Id: I728e8086c30d3259ea12b1041303a0b81811c1de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15Update Roboto font to 3.005 am: f5cf4162b5 am: 4f3939d55aSeigo Nonaka
Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2484977 Change-Id: Ic58c196071d7d7083762484906d9c7bd459e8d1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15Update Roboto font to 3.005 am: f5cf4162b5Seigo Nonaka
Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/2484977 Change-Id: If93481f25e0c7ea5b5f57de16024046922b496e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15Update Roboto font to 3.005 am: 2721fa12e3 am: 3cb4ec21deSeigo Nonaka
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/roboto-fonts/+/22024062 Change-Id: I532f526bf05af74cedb7154eaf7f542029a082da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15Update Roboto font to 3.005 am: 2721fa12e3 am: 137bc89901Seigo Nonaka
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/roboto-fonts/+/22024062 Change-Id: Ia92a5d3ab3622364f77e2f32bae471b91a7c830d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15Update Roboto font to 3.005 am: 2721fa12e3Seigo Nonaka
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/roboto-fonts/+/22024062 Change-Id: I70556a9401c1fb38db3c97ceaafd79084dcce85d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15Update Roboto font to 3.005 am: 2721fa12e3Seigo Nonaka
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/roboto-fonts/+/22024062 Change-Id: Ib160539df07b3ab776de0cd5a1eade25cce0d5d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14Update Roboto font to 3.005Seigo Nonaka
Bug: 273148054 Test: N/A Change-Id: If3652dd438fa2d82d961fc79d85e76627db897b9
2023-03-14Update Roboto font to 3.005Seigo Nonaka
Bug: 273148054 Test: N/A Merged-In: If3652dd438fa2d82d961fc79d85e76627db897b9 Change-Id: I1d2193dbfd7e3700da9c52f58e4bffcb339dc7a3
2022-08-05Update Roboto font which have empty glyph for control charactersSeigo Nonaka
Bug: 235922054 Test: atest ControlCharacterGlyphTest Change-Id: I67cec2f6a318f08c0dba47a91d879d51b7a12f4e
2021-10-08[automerger skipped] Merge Android 12 am: 2ac2cae4ed -s ours am: cf8130b3c3 ↵t_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-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_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000main-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-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Xin Li
-s ours am: 22d4450bcf -s ours am: 1295c157af -s ours am: 84bdf39435 -s ours am skip reason: Merged-In I61e1df4c9a673dbdf43a6166d0acd4e2ff15b9c5 with SHA-1 77493a891f is already in history Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/1847654 Change-Id: Ib1f286886429f857b834d253dc581e07f4f1e5d9
2021-10-08[automerger skipped] Merge Android 12 am: 2ac2cae4ed -s ours am: cf8130b3c3 ↵Xin Li
-s ours am: 22d4450bcf -s ours am: 1295c157af -s ours am skip reason: Merged-In I61e1df4c9a673dbdf43a6166d0acd4e2ff15b9c5 with SHA-1 77493a891f is already in history Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/1847654 Change-Id: Ia6fe23344c1babf234f91cff610d2aff72a8676c
2021-10-08[automerger skipped] Merge Android 12 am: 2ac2cae4ed -s ours am: cf8130b3c3 ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
-s ours am: 22d4450bcf -s ours am skip reason: Merged-In I61e1df4c9a673dbdf43a6166d0acd4e2ff15b9c5 with SHA-1 77493a891f is already in history Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/1847654 Change-Id: Iddbc3908505a9e9b73f9db14a30ca4ec13b77bbd
2021-10-08[automerger skipped] Merge Android 12 am: 2ac2cae4ed -s ours am: cf8130b3c3 ↵Xin Li
-s ours am skip reason: Merged-In I61e1df4c9a673dbdf43a6166d0acd4e2ff15b9c5 with SHA-1 77493a891f is already in history Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/1847654 Change-Id: Ic6501c7bf1677cc04d6f923dbc140aec6a3f4e15
2021-10-08[automerger skipped] Merge Android 12 am: 2ac2cae4ed -s oursXin Li
am skip reason: Merged-In I61e1df4c9a673dbdf43a6166d0acd4e2ff15b9c5 with SHA-1 77493a891f is already in history Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/1847654 Change-Id: Id71deffef58fbf1f71e39681f073e848d50819e3
2021-10-06Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
Bug: 202323961 Merged-In: I61e1df4c9a673dbdf43a6166d0acd4e2ff15b9c5 Change-Id: I0ddfad6880654b9b22b218d5a1bed41ea3e149f6
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
77493a891f -s ours am: b69f5e1d08 -s ours am: 33900de2cc -s ours am: 0197707dce -s ours am skip reason: Merged-In Iee5c190c35f89fa74617a58f561737efd3f634cd with SHA-1 bb627a75b8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/roboto-fonts/+/15571709 Change-Id: I0b97397b334ed55296248af0d55714122892142f
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
77493a891f -s ours am: b69f5e1d08 -s ours am: 33900de2cc -s ours am skip reason: Merged-In Iee5c190c35f89fa74617a58f561737efd3f634cd with SHA-1 bb627a75b8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/roboto-fonts/+/15571709 Change-Id: I6faa5a32b7aab93b7913d6200531b7c9700f279e