aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8d7836452e -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: 6cb5a3dcb6 -s ours am skip reason: Change-Id I0d75e4b20ab11973e1982cbfc4c277c082a6b9ca with SHA-1 59a36e21bb is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2159e824ce4a9a4d7c3724f1536bf7fa16cc05d8
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8d7836452e -s oursXin Li
am skip reason: Change-Id I0d75e4b20ab11973e1982cbfc4c277c082a6b9ca with SHA-1 59a36e21bb is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3bfb9f7c82b1f30e7f37b696f15f35e231b133d5
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: I0d75e4b20ab11973e1982cbfc4c277c082a6b9ca Change-Id: I234befe574132a61915ec31eb56036e2da844355
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/source-sans-pro am: ↵Bob Badour
9a30a4598b am: 215338520d am: e62b1f3a8c Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/source-sans-pro/+/1588657 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I147575cc75e04a71cc4e464bb4f6dc67ac779b4c
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/source-sans-pro am: ↵Bob Badour
9a30a4598b am: 215338520d Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/source-sans-pro/+/1588657 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icda42cae9829289d41dcea31b4ccaf49f8e27688
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/source-sans-pro am: ↵Bob Badour
9a30a4598b Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/source-sans-pro/+/1588657 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I91bc541e29b58d168187be7f31ddc733b2127169
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/source-sans-proandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-MIT SPDX-license-identifier-OFL legacy_by_exception_only to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I8b797e3bf1ca0a7ee58199bd3a65f282eaaff357
2020-11-24Mark ab/6881855 as merged am: 5dffa2b6d4 am: 59a36e21bbXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/source-sans-pro/+/13112759 Change-Id: Ie989a6deae1de3a806173c6d373dd31bf1bc55c2
2020-11-24Mark ab/6881855 as merged am: 5dffa2b6d4Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/source-sans-pro/+/13112759 Change-Id: I0d75e4b20ab11973e1982cbfc4c277c082a6b9ca
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I739bc2c220da237b37b959230ce8d438b33bcc10
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 407a3ccb8b -s ours am: ↵Xin Li
638b6cacef -s ours am: 2572d0388e -s ours am skip reason: Change-Id I041f8611e86550db7fb62604b8bcdd0dfe9ed42d with SHA-1 a5de77ff99 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/source-sans-pro/+/12796110 Change-Id: I1bc2db70b184f797c195a4e34cd795edc3f38f8a
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 407a3ccb8b -s ours am: ↵Xin Li
638b6cacef -s ours am skip reason: Change-Id I041f8611e86550db7fb62604b8bcdd0dfe9ed42d with SHA-1 a5de77ff99 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/source-sans-pro/+/12796110 Change-Id: Iaa916af3ae158b58d7be4c6c088a3a4574179449
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 407a3ccb8b -s oursXin Li
am skip reason: Change-Id I041f8611e86550db7fb62604b8bcdd0dfe9ed42d with SHA-1 a5de77ff99 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/source-sans-pro/+/12796110 Change-Id: I6cf2db413452cd96015233ac83116a7397782b37
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I041f8611e86550db7fb62604b8bcdd0dfe9ed42d Change-Id: I28da7c1d93aef1ea7445319b8bd0cec2258fa035
2020-09-11[automerger skipped] Merge Android R am: c89d2dd5ed -s ours am: 80dca1608e ↵Xin Li
-s ours am: 3785886fe3 -s ours am: cc9318bec5 -s ours am: a5ef32a1eb -s ours am skip reason: Change-Id Id1d8f01e2c3407a93da8418911837b4b31e36054 with SHA-1 674b7fc072 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/source-sans-pro/+/1422351 Change-Id: Iec5a15e5b80a082d07c321d789810682ad975495
2020-09-11[automerger skipped] Merge Android R am: c89d2dd5ed -s ours am: 80dca1608e ↵Xin Li
-s ours am: 3785886fe3 -s ours am: cc9318bec5 -s ours am skip reason: Change-Id Id1d8f01e2c3407a93da8418911837b4b31e36054 with SHA-1 674b7fc072 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/source-sans-pro/+/1422351 Change-Id: Ifad73857dbb6e94325281f602958219cfe69cc2b
2020-09-11[automerger skipped] Merge Android R am: c89d2dd5ed -s ours am: 80dca1608e ↵Xin Li
-s ours am: 3785886fe3 -s ours am skip reason: Change-Id Id1d8f01e2c3407a93da8418911837b4b31e36054 with SHA-1 674b7fc072 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/source-sans-pro/+/1422351 Change-Id: Ifc314423d9c137ec7f26f16db28b6f210fb55d22
2020-09-11[automerger skipped] Merge Android R am: c89d2dd5ed -s ours am: 80dca1608e ↵Xin Li
-s ours am skip reason: Change-Id Id1d8f01e2c3407a93da8418911837b4b31e36054 with SHA-1 674b7fc072 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/source-sans-pro/+/1422351 Change-Id: I9a46a2b5c84ac585727574044458335883287783
2020-09-11[automerger skipped] Merge Android R am: c89d2dd5ed -s oursXin Li
am skip reason: Change-Id Id1d8f01e2c3407a93da8418911837b4b31e36054 with SHA-1 674b7fc072 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/source-sans-pro/+/1422351 Change-Id: I9dbee7833762110f1b42bd9db03a7d11fd1b576c
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Id1d8f01e2c3407a93da8418911837b4b31e36054 Change-Id: I999a1c3c20bca308f2c2ab8e242960a4dadbd30c
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 674b7fc072 -s ours am: 26aec65650 -s ours am: 0b35b9a8f9 -s ours am: 25d4e53385 -s ours am skip reason: Change-Id I5936c387c7ec838981a31cb62923dcee81d68fe2 with SHA-1 ad4b880345 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/source-sans-pro/+/12470164 Change-Id: I97edd568a9973eb74936e9262f44bdd99a0e13e9
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 674b7fc072 -s ours am: 26aec65650 -s ours am: 0b35b9a8f9 -s ours am skip reason: Change-Id I5936c387c7ec838981a31cb62923dcee81d68fe2 with SHA-1 ad4b880345 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/source-sans-pro/+/12470164 Change-Id: I7d8ccb401398428634b00d8c262fe9a5aa2ac593
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 674b7fc072 -s ours am: 26aec65650 -s ours am skip reason: Change-Id I5936c387c7ec838981a31cb62923dcee81d68fe2 with SHA-1 ad4b880345 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/source-sans-pro/+/12470164 Change-Id: Ie95195c7b8577426215b7801931982b1990511fe
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 674b7fc072 -s ours am skip reason: Change-Id I5936c387c7ec838981a31cb62923dcee81d68fe2 with SHA-1 ad4b880345 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/source-sans-pro/+/12470164 Change-Id: Id09765da14ca61943c62e1a2c77b6873f26b880d
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I5936c387c7ec838981a31cb62923dcee81d68fe2 Change-Id: Id1d8f01e2c3407a93da8418911837b4b31e36054
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: b22b4bea82 -s ours am: ad4b880345 am: a5de77ff99 am: abf49c19e1 -s ours am skip reason: subject contains skip directive Change-Id: If2bcdbc2493b2f05c2480db8a1c02d4c31bf51d7
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: b22b4bea82 -s ours am: ad4b880345 am: a5de77ff99 Change-Id: I138f53c37b3e78b8d5b33e3f5fee4f58d42933f7
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: b22b4bea82 -s ours am: ad4b880345 Change-Id: I041f8611e86550db7fb62604b8bcdd0dfe9ed42d
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: b22b4bea82 -s ours am skip reason: subject contains skip directive Change-Id: I5936c387c7ec838981a31cb62923dcee81d68fe2
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li
Bug: 151763422 Change-Id: Icd3552d2198b1c526127aa3a6b734f4af8adcb46
2020-03-31Remove redundant NOTICE copied from LICENSE. am: ee02baaa18 am: 0c6dec4171 ↵Bob Badour
am: ea936c3bb5 am: c8300fcb15 am: 7dfc850ae9 Change-Id: Id757232ce85ebd5a800076f6bd114071be3476e5
2020-03-31Remove redundant NOTICE copied from LICENSE. am: ee02baaa18 am: 0c6dec4171 ↵Bob Badour
am: ea936c3bb5 am: c8300fcb15 Change-Id: Ib0ee5fa329b59bb48b5f655be67e68c1b059a61e
2020-03-31Remove redundant NOTICE copied from LICENSE. am: ee02baaa18 am: 0c6dec4171 ↵Bob Badour
am: ea936c3bb5 Change-Id: I1fee1a1e74bff6bf3398dd6ad381ceb97a3c8272
2020-03-31Remove redundant NOTICE copied from LICENSE. am: ee02baaa18 am: 0c6dec4171Bob Badour
Change-Id: I0fadafea955d54ecaeb4848e7a3d21aa09d80b54
2020-03-31Remove redundant NOTICE copied from LICENSE. am: ee02baaa18 am: 0c6dec4171Bob Badour
Change-Id: I17ec2ebc146fe7848b6de82f11a5fd263e6f644a
2020-03-31Remove redundant NOTICE copied from LICENSE. am: ee02baaa18Bob Badour
Change-Id: Ic5e082e1e62103b2ff5d42bc8683a45ebd21689a
2020-03-25Remove redundant NOTICE copied from LICENSE.Bob Badour
Identified using the below shell script: $ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \ | while read dir; do \ if [ -f "${dir}/NOTICE" ] \ && diff "${dir}/LICENSE" "${dir}/NOTICE" >/dev/null; then \ echo "${dir}/NOTICE"; \ fi; \ done Now that http://r.android.com/r/1235427 and http://r.android.com/r/1238719 are merged, LICENSE files copied into NOTICE files are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: I9cd7f9fe8ce9737b4635c7921eba8a6d61bb8e32
2019-05-17Convert Android.mk to Android.bp.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_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-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_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-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-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releasePatrice Arruda
See build/soong/README.md for more information. Fixes: b/132995274 Test: Built and checked if the fonts were installed in the correct location in the system image. Change-Id: I4375526d94cf59867d7cdb16070b76e0a63b3dc8
2019-01-23Add default code reviewers into OWNERSq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310platform-tools-29.0.6platform-tools-29.0.5android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12q_tzdata_aml_297100000ndk-sysroot-r21android12-mainline-tzdata-releaseandroid10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I48180c13444aaeef06cc43e7a14228b51f107211
2019-01-04Initial import of google-fonts/source-sans-proAmin Shaikh
Change-Id: Id66a6598636b59cccc29acc84a4c7e61b8341180 Fixes: 122327511 Test: make
2019-01-03Initial empty repositoryDiem Mai
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 17:05:47 +0000