summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 3e8a2a3b71 -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: 1185fd3f6e -s ours am skip reason: Change-Id I465b91828bff215ec01de8bcd5c31e4ac1742cbc with SHA-1 37aa0a9e57 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4d1a0a6a88ef25d70f7e1f4f5f5f4cb0fcfba7c0
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 3e8a2a3b71 -s oursXin Li
am skip reason: Change-Id I465b91828bff215ec01de8bcd5c31e4ac1742cbc with SHA-1 37aa0a9e57 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I677544156963916d258d7cc2087e056775432adc
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: I465b91828bff215ec01de8bcd5c31e4ac1742cbc Change-Id: Iafcb32644619a7275d56d8a762b19373bf35029e
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/lato am: 1fa280bd23 ↵Bob Badour
am: f0921e2e4f am: 30a857d723 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lato/+/1588637 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1392efa51937909f64f5be1e3b92667a3ddcfa2a
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/lato am: 1fa280bd23 ↵Bob Badour
am: f0921e2e4f Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lato/+/1588637 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib667c2e3781f0d97b18653be54ffe3847c1d3a23
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/lato am: 1fa280bd23Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lato/+/1588637 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia1da209a7dd73b8b004d6b8b8baee8179cc2db35
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/latoandroid-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: I1f070b7cdbd65d75c49ad76a4299df9928fc7cbc
2020-11-24Mark ab/6881855 as merged am: 3ebec8c88d am: 37aa0a9e57Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lato/+/13111706 Change-Id: Ibc9d8d97db034f0d56325f88e862c8b924ac8239
2020-11-24Mark ab/6881855 as merged am: 3ebec8c88dXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lato/+/13111706 Change-Id: I465b91828bff215ec01de8bcd5c31e4ac1742cbc
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I19e6564613232180fc4bac781eae1866aba62a6a
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: f946409ded -s ours am: ↵Xin Li
4c84ea63e4 -s ours am: 5be1381530 -s ours am skip reason: Change-Id Ifb704b2ce246cad9174e4d93bcb141cee7b87375 with SHA-1 bb1c432fff is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lato/+/12796861 Change-Id: Ic3eb07ae18fe65c378295282c2799a8a095488bc
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: f946409ded -s ours am: ↵Xin Li
4c84ea63e4 -s ours am skip reason: Change-Id Ifb704b2ce246cad9174e4d93bcb141cee7b87375 with SHA-1 bb1c432fff is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lato/+/12796861 Change-Id: I9cdf5147203146674ecbc97a17967828525245ce
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: f946409ded -s oursXin Li
am skip reason: Change-Id Ifb704b2ce246cad9174e4d93bcb141cee7b87375 with SHA-1 bb1c432fff is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lato/+/12796861 Change-Id: Iadd510ea936643bd93e5a49570e93054986d9c80
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ifb704b2ce246cad9174e4d93bcb141cee7b87375 Change-Id: I4d6823e06c3691e981509b5b5c4ce34d20bc57d8
2020-09-11[automerger skipped] Merge Android R am: e65062f1c3 -s ours am: f446bf5ba7 ↵Xin Li
-s ours am: 6be128f132 -s ours am: 8e8a8ca723 -s ours am: 07f3bcd844 -s ours am skip reason: Change-Id I1b25ac53a5929017ba076e1b79d202d73a319d28 with SHA-1 d610f22a75 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lato/+/1422349 Change-Id: I2ca732b8fb224b62e53e18db6df7e72c99f0081b
2020-09-11[automerger skipped] Merge Android R am: e65062f1c3 -s ours am: f446bf5ba7 ↵Xin Li
-s ours am: 6be128f132 -s ours am: 8e8a8ca723 -s ours am skip reason: Change-Id I1b25ac53a5929017ba076e1b79d202d73a319d28 with SHA-1 d610f22a75 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lato/+/1422349 Change-Id: I7fc1b43320526f8052e79a6c1f06faa28436a148
2020-09-11[automerger skipped] Merge Android R am: e65062f1c3 -s ours am: f446bf5ba7 ↵Xin Li
-s ours am: 6be128f132 -s ours am skip reason: Change-Id I1b25ac53a5929017ba076e1b79d202d73a319d28 with SHA-1 d610f22a75 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lato/+/1422349 Change-Id: Iec1868785037dbf4cb9656009c41612897944886
2020-09-11[automerger skipped] Merge Android R am: e65062f1c3 -s ours am: f446bf5ba7 ↵Xin Li
-s ours am skip reason: Change-Id I1b25ac53a5929017ba076e1b79d202d73a319d28 with SHA-1 d610f22a75 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lato/+/1422349 Change-Id: Ie7cfaa684f6bba18903691531cb533db6bad551d
2020-09-11[automerger skipped] Merge Android R am: e65062f1c3 -s oursXin Li
am skip reason: Change-Id I1b25ac53a5929017ba076e1b79d202d73a319d28 with SHA-1 d610f22a75 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/lato/+/1422349 Change-Id: I5e2e969755e83190cec72dc194eea65fe17bb466
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I1b25ac53a5929017ba076e1b79d202d73a319d28 Change-Id: I106ef0086754e8f1d139b05346bdb507d0cb277d
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d610f22a75 -s ours am: 7e68837e6e -s ours am: 478d9adfcf -s ours am: b9fe7b37bb -s ours am skip reason: Change-Id I4aa4df070a927b3f6cc2099ba6bbacc1fece664b with SHA-1 db35733692 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lato/+/12470071 Change-Id: I08a9c1e04bcc0f81b17d60149db6485fcc1d0f25
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d610f22a75 -s ours am: 7e68837e6e -s ours am: 478d9adfcf -s ours am skip reason: Change-Id I4aa4df070a927b3f6cc2099ba6bbacc1fece664b with SHA-1 db35733692 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lato/+/12470071 Change-Id: Ie940de3393e7472431db6a27c43d221158653a49
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d610f22a75 -s ours am: 7e68837e6e -s ours am skip reason: Change-Id I4aa4df070a927b3f6cc2099ba6bbacc1fece664b with SHA-1 db35733692 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lato/+/12470071 Change-Id: I61bd9f30487508aa621766edc8a9f154513289e7
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d610f22a75 -s ours am skip reason: Change-Id I4aa4df070a927b3f6cc2099ba6bbacc1fece664b with SHA-1 db35733692 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/lato/+/12470071 Change-Id: Ifd753770ef6b3dbf3787e21099dad0ceef2da7c5
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I4aa4df070a927b3f6cc2099ba6bbacc1fece664b Change-Id: I1b25ac53a5929017ba076e1b79d202d73a319d28
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f77b1a4f33 -s ours am: db35733692 am: bb1c432fff am: 83d169b354 -s ours am skip reason: subject contains skip directive Change-Id: I72b4be13dd0f930cd69c318cb0a16efb91cc8f00
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f77b1a4f33 -s ours am: db35733692 am: bb1c432fff Change-Id: I2cd23eb599bc80f2f5520b42508242865e8ad0df
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f77b1a4f33 -s ours am: db35733692 Change-Id: Ifb704b2ce246cad9174e4d93bcb141cee7b87375
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f77b1a4f33 -s ours am skip reason: subject contains skip directive Change-Id: I4aa4df070a927b3f6cc2099ba6bbacc1fece664b
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: Iceaa9dbc2caf8cc1ab62ca530f9dc57335cebb15
2020-03-31Remove redundant NOTICE copied from LICENSE. am: bcc3ca86de am: 6df8787a7e ↵Bob Badour
am: d0c189f28b am: 222634f546 am: 6c9fcc03b3 Change-Id: Idd35a9756372754074dbc2e94dac288c52048e29
2020-03-31Remove redundant NOTICE copied from LICENSE. am: bcc3ca86de am: 6df8787a7e ↵Bob Badour
am: d0c189f28b am: 222634f546 Change-Id: Ifa3a65f61f3c1bed91d9e41fc3d5971cf56bf944
2020-03-31Remove redundant NOTICE copied from LICENSE. am: bcc3ca86de am: 6df8787a7e ↵Bob Badour
am: d0c189f28b Change-Id: I38568e1829b3c0983db01e3f8e4e89bcdbecfba5
2020-03-31Remove redundant NOTICE copied from LICENSE. am: bcc3ca86de am: 6df8787a7eBob Badour
Change-Id: I2a12397e76a27d40a9f56816bea21e36f6ef656e
2020-03-31Remove redundant NOTICE copied from LICENSE. am: bcc3ca86de am: 6df8787a7eBob Badour
Change-Id: Idc31a329469085a13acce2e80062cdce78311f6f
2020-03-31Remove redundant NOTICE copied from LICENSE. am: bcc3ca86deBob Badour
Change-Id: Ic085889d2cccb686df560a9401490f2f1a963a86
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: I7c4a4248ab856ffee829675b5517ce305d5b7cac
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/133011258 Test: Built and checked if the fonts were installed in the correct location in the system image. Change-Id: I185d67f54d8ad15f5e5aaad0077c51673974daf5
2019-04-02Move Lato to product partition.q_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-releaseAmin Shaikh
Bug: 123701811 Test: make Change-Id: I2446bd6b84ae7eb3e6640baada2d6391fa030712
2019-01-23Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I1fbf8b2863b78f632134f55b4bbbfe2d276ed467
2019-01-09Remove character from font that was breakingSantiago Etchebehere
When ag/5928763 was merged, it broke the build because fontchain_linter found that this font includes U+2600. So using fonttools, the character was removed and fontchain_linter is now happy. Bug: 118756857 Test: m fontchain_lint Test: m Test: Visual test on device Change-Id: I75f1a5e8bf6876f5aea80961b5374f0e977a64ca
2019-01-04Initial import of google-fonts/latoAmin Shaikh
Change-Id: I556f61ffd6fb2534e68d52c2257b8dd846093c00 Fixes: 122326894 Test: make
2019-01-03Initial empty repositoryDiem Mai
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 22:04:44 +0000