aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 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
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-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
2020-10-13[automerger skipped] Merge ab/6749736 in stage. am: 08103b7215 -s ours am: ↵Xin Li
fd66cc357c -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: Ic361c96dd1fcf0912dca54d20470440f675a76d9
2020-10-13[automerger skipped] Merge ab/6749736 in stage. am: 08103b7215 -s oursXin Li
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: I9f04fcce413a929db05686b48884472347b95e24
2020-10-08Merge ab/6749736 in stage.Xin Li
Bug: 167233921 Merged-In: I29bbdc47a1e66d8703263794bc1940d7d5dd8e2e Change-Id: I178fe79b2c04e7ab0786a92c3d6b780f1e3dd1d7
2020-09-21[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: 20bea1511f am: 32ae7b0365 -s ours am: a5404a7303 -s ours am: 55294a3c13 -s ours am: 60aea0a1ff -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/1429918 Change-Id: I7583891397987252bb6d203a92f623cdd6662816
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: 20bea1511f am: 32ae7b0365 -s ours am: a5404a7303 -s ours am: 55294a3c13 -s ours am skip reason: Change-Id Ic652534496edfbe408753f4a04f4daf51cccfc16 with SHA-1 45eac04dcb is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/1429918 Change-Id: Icbcbce7c8657e6424c3a98f5c4ee388a793122ae
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: 20bea1511f am: 32ae7b0365 -s ours am: a5404a7303 -s ours am skip reason: Change-Id Ic652534496edfbe408753f4a04f4daf51cccfc16 with SHA-1 45eac04dcb is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/1429918 Change-Id: Ia8c1e0fe5e586cb2e81c5058e226b4203c7a2095
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: 20bea1511f am: 32ae7b0365 -s ours am skip reason: Change-Id Ic652534496edfbe408753f4a04f4daf51cccfc16 with SHA-1 45eac04dcb is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/1429918 Change-Id: Idc7aa1038f3759d9bd46b32111d9636146123577
2020-09-19Merge mainline-release 6664920 to master - DO NOT MERGE am: 20bea1511fBill Yi
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/1429918 Change-Id: I37da16294e903c3171c41e027f871ce6c49a6115
2020-09-17Merge mainline-release 6664920 to master - DO NOT MERGEplatform-tools-30.0.5Bill Yi
Merged-In: Ic652534496edfbe408753f4a04f4daf51cccfc16 Change-Id: I8e81765d063e87d211d1a5bfd509b9096c18a6d7
2020-09-15[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: 06c1d1c8c8 -s ours am: 45eac04dcb -s ours am: 7798769856 -s ours am: aaad659a8b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/12579355 Change-Id: Ia5244b65ac906725f0c4d67c46054f85ab0296b0
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: 06c1d1c8c8 -s ours am: 45eac04dcb -s ours am: 7798769856 -s ours am skip reason: Change-Id Ia9fb9f3b964850daeba5b0a3bedd3c04c37b6e97 with SHA-1 dce679f709 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/12579355 Change-Id: Id27cbc4cfa060181223639ac28f4d2f49af88f4d
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: 06c1d1c8c8 -s ours am: 45eac04dcb -s ours am skip reason: Change-Id Ia9fb9f3b964850daeba5b0a3bedd3c04c37b6e97 with SHA-1 dce679f709 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/12579355 Change-Id: I637a15579ef43ea4d29f32dc0cfa4475d61e6214
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: 06c1d1c8c8 -s ours am skip reason: Change-Id Ia9fb9f3b964850daeba5b0a3bedd3c04c37b6e97 with SHA-1 dce679f709 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/12579355 Change-Id: Ic652534496edfbe408753f4a04f4daf51cccfc16
2020-09-13Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGEBill Yi
Merged-In: Ia9fb9f3b964850daeba5b0a3bedd3c04c37b6e97 Change-Id: I5c37566af95a45de2a490540947e384b0c648c8f
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 33faa2ac3e -s ours am: dce679f709 -s ours am: 2a11302d90 -s ours am: e8e4dae9f9 -s ours am skip reason: Change-Id Ia6f397db17f229eee50939705459e0409fdebbbe with SHA-1 3375767a91 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/12470070 Change-Id: I3bcba6bee17bc8573fe7b9a9d8bc100ffd4ae311
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 33faa2ac3e -s ours am: dce679f709 -s ours am: 2a11302d90 -s ours am skip reason: Change-Id Ia6f397db17f229eee50939705459e0409fdebbbe with SHA-1 3375767a91 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/12470070 Change-Id: Ifa8ea25f4723301daa69723cec864b3e1eb6a5c2
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 33faa2ac3e -s ours am: dce679f709 -s ours am skip reason: Change-Id Ia6f397db17f229eee50939705459e0409fdebbbe with SHA-1 3375767a91 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/12470070 Change-Id: I407ee9fd5e2624a86175d88d92427689fc4302b4
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 33faa2ac3e -s ours am skip reason: Change-Id Ia6f397db17f229eee50939705459e0409fdebbbe with SHA-1 3375767a91 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/12470070 Change-Id: Ia9fb9f3b964850daeba5b0a3bedd3c04c37b6e97
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li
Bug: 166295507 Merged-In: Ia6f397db17f229eee50939705459e0409fdebbbe Change-Id: I30d8b775ff3b71258eb5ce6ead1ebb8e5b29c4de
2020-05-20Remove new styles from AOSP am: ec4d8a9ca6 am: a205363235 am: 6be5d827f6Jay Aliomer
Change-Id: Icda88ad9d5bcaa9663216915fcd9f685170dd45a
2020-05-20Remove new styles from AOSP am: ec4d8a9ca6 am: b28d877934 am: 4f7dae4db0Jay Aliomer
Change-Id: Id8d503d89ca75c2c55fc08b1cae07a5deef39db6
2020-05-20Remove new styles from AOSP am: ec4d8a9ca6 am: a205363235Jay Aliomer
Change-Id: Ic384b63298c75f177d56316b64934200adbea2a3
2020-05-20Remove new styles from AOSP am: ec4d8a9ca6 am: b28d877934Jay Aliomer
Change-Id: Ie0dfaa01b06cdd9ac550bdf958427bdfadbcfc0c
2020-05-20Remove new styles from AOSP am: ec4d8a9ca6Jay Aliomer
Change-Id: I29bbdc47a1e66d8703263794bc1940d7d5dd8e2e
2020-05-20Remove new styles from AOSP am: ec4d8a9ca6android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-releaseJay Aliomer
Change-Id: I2f162f603e032980ad2984c265a273af160e5dd2
2020-05-15Remove new styles from AOSPandroid-11.0.0_r16android11-d1-b-releaseJay Aliomer
Fixes: 156779458 Test: manually check styles" Change-Id: I78736e6408c1feb98949fb83c2f4c0574e8b2794
2020-05-06Snap for 6465939 from 505dbcace7c95e177ff217448a34d1c0a8c66807 to ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r4android-mainline-11.0.0_r33android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r10android-mainline-11.0.0_r1android11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid-build-team Robot
mainline-release Change-Id: I05fd9560970bfb520f1acd492f52467ddb9eb01f
2020-04-29Snap for 6441286 from 9b26afd212afc25e9cc0c2a0a2ee70fe73e43cf7 to ↵android-build-team Robot
mainline-release Change-Id: I99135518cb3bf6ed7f374426dac92b6bcdc8e788
2020-04-28Adding style packages/fonts am: 806be79ac8 am: 7cee99a6af am: 9b26afd212 am: ↵Jay Aliomer
cf6f5fa4ea Change-Id: I7e641628188d7b38546c9f83722f3237e3ef8742
2020-04-28Adding style packages/fonts am: 806be79ac8 am: 7cee99a6af am: 9b26afd212Jay Aliomer
Change-Id: Ib1cf9c1fe6f10800bfb47a03185501b3b6f43ee8
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 21:20:14 +0000