summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 442b46cd11 -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: 97199e2b9c -s ours am skip reason: Change-Id I2bdf9f6af681ee700f86a9ef2c5609ff29e3f254 with SHA-1 5e08b7cf6c is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibd14e3951beec207fa2c143e72e82c5d7489bafa
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 442b46cd11 -s oursXin Li
am skip reason: Change-Id I2bdf9f6af681ee700f86a9ef2c5609ff29e3f254 with SHA-1 5e08b7cf6c is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib411b6f9d2083e07eed0bc9337c16aa33226d241
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: I2bdf9f6af681ee700f86a9ef2c5609ff29e3f254 Change-Id: I0c74791d944d31f5c2d67aab6cba15bfd8792b9b
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/lustria am: ↵Bob Badour
c49f024acb am: 197fe642d7 am: ca238c3fb8 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1588698 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1a17d34b37363c59a8634deee79c974d477533a8
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/lustria am: ↵Bob Badour
c49f024acb am: 197fe642d7 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1588698 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0bbe1c5f48ba263fb19ba432508969e3eebadb1a
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/lustria am: c49f024acbBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1588698 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib55d58c283c7798886da5460eac342eb787f6251
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/lustriaandroid-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: Ie90c6ad2b5d32879ebeae1048a5c64ea5cf87f2f
2020-12-10[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: fc40bce7c5 -s ↵Xin Li
ours am: 384dd9144c -s ours am: 5e08b7cf6c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1521258 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8f71a3cf35c83bd10ae8ad9232b782321f3251b9
2020-12-10[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: fc40bce7c5 -s ↵Xin Li
ours am: 384dd9144c -s ours am skip reason: Change-Id I336f2eca214c611698cc1b536e7ff80c800b397a with SHA-1 b41b262136 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1521258 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2bdf9f6af681ee700f86a9ef2c5609ff29e3f254
2020-12-10[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: fc40bce7c5 -s oursXin Li
am skip reason: Change-Id I336f2eca214c611698cc1b536e7ff80c800b397a with SHA-1 b41b262136 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1521258 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I26a266880615387d19d6f15daeb562547719f299
2020-12-08DO NOT MERGE - Merge Android R QPR1Xin Li
Bug: 172690556 Merged-In: I336f2eca214c611698cc1b536e7ff80c800b397a Change-Id: I139c4c62c9b05937aabb48bc9b4bcf001044fed3
2020-12-03[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ↵Xin Li
b41b262136 -s ours am: 3d75182b76 -s ours am skip reason: Change-Id I463ed2e51635573a01d13d90dd437e03d2d9f641 with SHA-1 9618d05d2d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/13120508 Change-Id: Ie27a66daa6ed5d35ff546cda886e60b4c0a8cef9
2020-12-03[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ↵Xin Li
b41b262136 -s ours am skip reason: Change-Id I463ed2e51635573a01d13d90dd437e03d2d9f641 with SHA-1 9618d05d2d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/13120508 Change-Id: I8a10116b9eb2f49d6b77b0bdac040ed296b78917
2020-11-23Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855temp_rvc_qpr_mergeXin Li
Bug: 172690556 Merged-In: I463ed2e51635573a01d13d90dd437e03d2d9f641 Change-Id: I336f2eca214c611698cc1b536e7ff80c800b397a
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 9c636cf8e9 -s ours ↵Xin Li
am: b8b8219469 -s ours am: e9a51f00be -s ours am: 899d696560 -s ours am skip reason: Change-Id If33e1a521aa7d7253e8f558942d1e3d8a31e8dae with SHA-1 d2167f2039 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1466502 Change-Id: I2219b0f178368b3873809d89d536e1afd42239af
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 9c636cf8e9 -s ours ↵Xin Li
am: b8b8219469 -s ours am: e9a51f00be -s ours am skip reason: Change-Id If33e1a521aa7d7253e8f558942d1e3d8a31e8dae with SHA-1 d2167f2039 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1466502 Change-Id: If19630df2e7872a545dfe418ee74d5b4ebef7141
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 9c636cf8e9 -s ours ↵Xin Li
am: b8b8219469 -s ours am skip reason: Change-Id If33e1a521aa7d7253e8f558942d1e3d8a31e8dae with SHA-1 d2167f2039 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1466502 Change-Id: Id2600ebcb1a740ca5ab9ec07e79ee333fcafc8ef
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 9c636cf8e9 -s oursXin Li
am skip reason: Change-Id If33e1a521aa7d7253e8f558942d1e3d8a31e8dae with SHA-1 d2167f2039 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1466502 Change-Id: I377a256ce3203b651ae2908a9cfff3e29ab4cda5
2020-10-19Merge redfin/bramble support.Xin Li
Bug: 171218636 Merged-In: If33e1a521aa7d7253e8f558942d1e3d8a31e8dae Change-Id: I29268ba0478d2c52b75d1c8bdb964ba38e29fe00
2020-10-13[automerger skipped] Merge ab/6749736 in stage. am: d2167f2039 -s ours am: ↵Xin Li
875b84bc52 -s ours am: 4eea1d4242 -s ours am skip reason: Change-Id I27aaf6b40bf622f7168846a0f5b35316f9b5138c with SHA-1 92da5d93fa is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/12804432 Change-Id: Ie2fee68bf9c478b1afd80b13e2926536a25a7823
2020-10-13[automerger skipped] Merge ab/6749736 in stage. am: d2167f2039 -s ours am: ↵Xin Li
875b84bc52 -s ours am skip reason: Change-Id I27aaf6b40bf622f7168846a0f5b35316f9b5138c with SHA-1 92da5d93fa is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/12804432 Change-Id: I8e88531a2cb80602c0c19ebefdf2089da6e98f6e
2020-10-13[automerger skipped] Merge ab/6749736 in stage. am: d2167f2039 -s oursXin Li
am skip reason: Change-Id I27aaf6b40bf622f7168846a0f5b35316f9b5138c with SHA-1 92da5d93fa is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/12804432 Change-Id: I9cb34dbf9283ea2ce2f68138e9b9a9ded2d66544
2020-10-08Merge ab/6749736 in stage.Xin Li
Bug: 167233921 Merged-In: I27aaf6b40bf622f7168846a0f5b35316f9b5138c Change-Id: If33e1a521aa7d7253e8f558942d1e3d8a31e8dae
2020-09-21[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: a2ce4bb806 am: fcf35b5062 -s ours am: 129ee1a03f -s ours am: 1d6265642c -s ours am: 9618d05d2d -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1430117 Change-Id: I735906a35b0917e7441c8b5b51742fa5e3a15887
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: a2ce4bb806 am: fcf35b5062 -s ours am: 129ee1a03f -s ours am: 1d6265642c -s ours am skip reason: Change-Id I16a204e08cff651469f1358d944a9eb738083d4a with SHA-1 4b9cd14c59 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1430117 Change-Id: I463ed2e51635573a01d13d90dd437e03d2d9f641
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: a2ce4bb806 am: fcf35b5062 -s ours am: 129ee1a03f -s ours am skip reason: Change-Id I16a204e08cff651469f1358d944a9eb738083d4a with SHA-1 4b9cd14c59 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1430117 Change-Id: Ic041ea83604c5d65fa42eb69ca0dfc7d698080fa
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: a2ce4bb806 am: fcf35b5062 -s ours am skip reason: Change-Id I16a204e08cff651469f1358d944a9eb738083d4a with SHA-1 4b9cd14c59 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1430117 Change-Id: I0969e054ce8aa46cbba6c0d73448753bae6d6554
2020-09-19Merge mainline-release 6664920 to master - DO NOT MERGE am: a2ce4bb806Bill Yi
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/1430117 Change-Id: I1802c7ff72266f6f44c04d9de6515b0cba991350
2020-09-17Merge mainline-release 6664920 to master - DO NOT MERGEplatform-tools-30.0.5Bill Yi
Merged-In: I16a204e08cff651469f1358d944a9eb738083d4a Change-Id: I1eac3087bdb270236092854c544c1cd77d2be727
2020-09-15[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: b0b47b4c02 -s ours am: 4b9cd14c59 -s ours am: 6e1d2df57f -s ours am: daf52faf62 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/12579356 Change-Id: If1ff3519d6f021b987d4c13ce539dce9bbcecfd4
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: b0b47b4c02 -s ours am: 4b9cd14c59 -s ours am: 6e1d2df57f -s ours am skip reason: Change-Id I4066da55aa7b3aac606d5bbf9830f7265a82b2ca with SHA-1 0f4da2db17 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/12579356 Change-Id: Iacb67828ca0425c0c9843e942c525e0c27939199
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: b0b47b4c02 -s ours am: 4b9cd14c59 -s ours am skip reason: Change-Id I4066da55aa7b3aac606d5bbf9830f7265a82b2ca with SHA-1 0f4da2db17 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/12579356 Change-Id: Id47c50ff17a70ae23818554d448b1cd7223ed080
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: b0b47b4c02 -s ours am skip reason: Change-Id I4066da55aa7b3aac606d5bbf9830f7265a82b2ca with SHA-1 0f4da2db17 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/12579356 Change-Id: I16a204e08cff651469f1358d944a9eb738083d4a
2020-09-13Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGEBill Yi
Merged-In: I4066da55aa7b3aac606d5bbf9830f7265a82b2ca Change-Id: I261d5909b521d17e1e34f3dfe01570ccdd40277a
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: be3cec1a7a -s ours am: 0f4da2db17 -s ours am: 3f6815d213 -s ours am: 692075fd68 -s ours am skip reason: Change-Id I3124c3bd018f6bb27ab55fa547edb0e3d7f3ce24 with SHA-1 40300a49c7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/12469674 Change-Id: I224e3b75ef9de93b9cd866f926cb794d50e70497
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: be3cec1a7a -s ours am: 0f4da2db17 -s ours am: 3f6815d213 -s ours am skip reason: Change-Id I3124c3bd018f6bb27ab55fa547edb0e3d7f3ce24 with SHA-1 40300a49c7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/12469674 Change-Id: I7e9931c0c9b3c80cf2c45d3ff65dcc16f380d413
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: be3cec1a7a -s ours am: 0f4da2db17 -s ours am skip reason: Change-Id I3124c3bd018f6bb27ab55fa547edb0e3d7f3ce24 with SHA-1 40300a49c7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/12469674 Change-Id: I22bffac666abdc35261b06bc69dcf9b3c08f651f
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: be3cec1a7a -s ours am skip reason: Change-Id I3124c3bd018f6bb27ab55fa547edb0e3d7f3ce24 with SHA-1 40300a49c7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lustria/+/12469674 Change-Id: I4066da55aa7b3aac606d5bbf9830f7265a82b2ca
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li
Bug: 166295507 Merged-In: I3124c3bd018f6bb27ab55fa547edb0e3d7f3ce24 Change-Id: I6086b8b64b9fa3f6593a1c43a13a36dc85dd0f87
2020-05-20Remove new styles from AOSP am: aff58cef5c am: 3a47268e4b am: 18b158057dJay Aliomer
Change-Id: Icef3fe467df655c2ddbf5603198d1531e47d5c9e
2020-05-20Remove new styles from AOSP am: aff58cef5c am: 92da5d93fa am: f9566c63b4Jay Aliomer
Change-Id: Ib73918d552325177839fec55b9a590d60604ad32
2020-05-20Remove new styles from AOSP am: aff58cef5c am: 3a47268e4bJay Aliomer
Change-Id: I92ed8c35df17796bc781b201ecb0da2a86b6c86a
2020-05-20Remove new styles from AOSP am: aff58cef5c am: 92da5d93faJay Aliomer
Change-Id: If91e215c81820c762539db8251cff8e0886434f3
2020-05-20Remove new styles from AOSP am: aff58cef5cJay Aliomer
Change-Id: I27aaf6b40bf622f7168846a0f5b35316f9b5138c
2020-05-20Remove new styles from AOSP am: aff58cef5candroid-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: I7efe65fe36aec54a2b5d4435377e255cb9d58074
2020-05-15Remove new styles from AOSPandroid-11.0.0_r16android11-d1-b-releaseJay Aliomer
Fixes: 156779458 Test: manually check styles" Change-Id: I2b72bfff179b28e59c163675823b854ab8ff7d37
2020-05-06Snap for 6465939 from e695126b2593cb97cab5cad5f061df6c4bd7bb2d 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: Ib6dda7c55333e17554a5b29daf0e6afc4fadd1a4
2020-04-29Snap for 6441286 from c79862005c6745993438fb47abccee615a26f4da to ↵android-build-team Robot
mainline-release Change-Id: Iaa95c72f8ed88ed9c55976ccc0d9a578945a9b6b
2020-04-28Adding style packages/fonts am: ea7c8be61e am: bdae96c355 am: c79862005c am: ↵Jay Aliomer
c2eae2e6ec Change-Id: I6d521a6b6068cf91e5fe32a6d70f17afe6609f3f
2020-04-28Adding style packages/fonts am: ea7c8be61e am: bdae96c355 am: c79862005cJay Aliomer
Change-Id: Id269fa7762eb2179bfb335ca171a5a1909713551
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 04:43:52 +0000