summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 1005dcf5fb -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: 4fe65eb0fc -s ours am skip reason: Change-Id Ic3e57d2e660cdf3e93cc9c365f37ed706c90f9ab with SHA-1 ad83b0871f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib8e38b4a2a7cd181aebddc17ee0ab21f8cfd0134
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 1005dcf5fb -s oursXin Li
am skip reason: Change-Id Ic3e57d2e660cdf3e93cc9c365f37ed706c90f9ab with SHA-1 ad83b0871f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I47df30b7bee9db7f17da3ae139ac3a434000fbde
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: Ic3e57d2e660cdf3e93cc9c365f37ed706c90f9ab Change-Id: If8705273cc838b59ad8c11978a0aeb42aee59774
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arvo am: b2ff1fcb97 ↵Bob Badour
am: e715f8c956 am: 619db42d22 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1588658 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id0be98f84afb56542ba6f1eea633c71900abfde3
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arvo am: b2ff1fcb97 ↵Bob Badour
am: e715f8c956 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1588658 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic28b4400167eb995e138a7a6d19925753fcf21e3
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arvo am: b2ff1fcb97Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1588658 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idbc96b7b16e8a47ffd676bef8cc425340fd95f27
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arvoandroid-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: I855e0bb3feb22613bd72c46454aabacda8a8584d
2020-11-24Mark ab/6881855 as merged am: 1c247d3914 am: ad83b0871fXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/13109875 Change-Id: I00083f0e9fabf947a98259ba54e9bd633a58d017
2020-11-24Mark ab/6881855 as merged am: 1c247d3914Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/13109875 Change-Id: Ic3e57d2e660cdf3e93cc9c365f37ed706c90f9ab
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I65147cbdb0388475f362d7c3e3e68e83545fc221
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 1642972ff3 -s ours am: ↵Xin Li
ea6876bac8 -s ours am: 2ddff843ae -s ours am skip reason: Change-Id I199f0079097cbd7b8b553a705d973d556d8860a4 with SHA-1 e827769263 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/12795747 Change-Id: Idb0c3364c02a2fefee20110d12137003b61e6e76
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 1642972ff3 -s ours am: ↵Xin Li
ea6876bac8 -s ours am skip reason: Change-Id I199f0079097cbd7b8b553a705d973d556d8860a4 with SHA-1 e827769263 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/12795747 Change-Id: Id36fb47e7b0bca18f5754992a7000a966b275b34
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 1642972ff3 -s oursXin Li
am skip reason: Change-Id I199f0079097cbd7b8b553a705d973d556d8860a4 with SHA-1 e827769263 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/12795747 Change-Id: Ia6d1407f1e3a4227c3f2f21a301018ab30b01d26
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I199f0079097cbd7b8b553a705d973d556d8860a4 Change-Id: I31a94d253066d5e4cdb444cbf21b5d32018a8898
2020-09-11[automerger skipped] Merge Android R am: ed44f0cbef -s ours am: 93349d1425 ↵Xin Li
-s ours am: 6b272c2ed4 -s ours am: 23445575f1 -s ours am: a70c4b653c -s ours am skip reason: Change-Id Idbf8064b452046180970762ee90d6539336fd54a with SHA-1 58f1f69a0e is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1422368 Change-Id: Ib2610d157beae54ae39b4ba777936eab8d1d37b3
2020-09-11[automerger skipped] Merge Android R am: ed44f0cbef -s ours am: 93349d1425 ↵Xin Li
-s ours am: 6b272c2ed4 -s ours am: 23445575f1 -s ours am skip reason: Change-Id Idbf8064b452046180970762ee90d6539336fd54a with SHA-1 58f1f69a0e is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1422368 Change-Id: Iecb66b86dfe078502d734b5bcef187f1df4c9341
2020-09-11[automerger skipped] Merge Android R am: ed44f0cbef -s ours am: 93349d1425 ↵Xin Li
-s ours am: 6b272c2ed4 -s ours am skip reason: Change-Id Idbf8064b452046180970762ee90d6539336fd54a with SHA-1 58f1f69a0e is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1422368 Change-Id: I33aab33c9bc17d554aa7ca9889ead80fc2808dfc
2020-09-11[automerger skipped] Merge Android R am: ed44f0cbef -s ours am: 93349d1425 ↵Xin Li
-s ours am skip reason: Change-Id Idbf8064b452046180970762ee90d6539336fd54a with SHA-1 58f1f69a0e is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1422368 Change-Id: Id949f4ecf73e9c4b4be8543d9566e5e93bbfa992
2020-09-11[automerger skipped] Merge Android R am: ed44f0cbef -s oursXin Li
am skip reason: Change-Id Idbf8064b452046180970762ee90d6539336fd54a with SHA-1 58f1f69a0e is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1422368 Change-Id: I18c998cf63cfd1ada1051f881a71e3d9e0aac1f0
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Idbf8064b452046180970762ee90d6539336fd54a Change-Id: I02e77b1f0125769eac1a34b00261633b8014e5bf
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 58f1f69a0e -s ours am: 32a1d90598 -s ours am: c83d2abdf2 -s ours am: ae02f3cbc2 -s ours am skip reason: Change-Id Ia2bf7669ab40996c26e2b0db5fec9387efa1a91b with SHA-1 a025d830e6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/12470069 Change-Id: I20dae1d794adfbb7c5c097271c42d9c135dace9c
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 58f1f69a0e -s ours am: 32a1d90598 -s ours am: c83d2abdf2 -s ours am skip reason: Change-Id Ia2bf7669ab40996c26e2b0db5fec9387efa1a91b with SHA-1 a025d830e6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/12470069 Change-Id: Id05ba9e43c27125049ef16e1852ae3e5e8b166bd
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 58f1f69a0e -s ours am: 32a1d90598 -s ours am skip reason: Change-Id Ia2bf7669ab40996c26e2b0db5fec9387efa1a91b with SHA-1 a025d830e6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/12470069 Change-Id: Id71efff9fcc0b422f3782d0794cc63fa65193b64
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 58f1f69a0e -s ours am skip reason: Change-Id Ia2bf7669ab40996c26e2b0db5fec9387efa1a91b with SHA-1 a025d830e6 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/12470069 Change-Id: I7964d349d79d6a313926b8ce60fff84883efa617
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: Ia2bf7669ab40996c26e2b0db5fec9387efa1a91b Change-Id: Idbf8064b452046180970762ee90d6539336fd54a
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 69e476290c -s ours am: a025d830e6 am: e827769263 am: 477656d880 -s ours am skip reason: subject contains skip directive Change-Id: Ib95b429e9d7a6f66d864c4ef97e55727dd4295db
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 69e476290c -s ours am: a025d830e6 am: e827769263 Change-Id: I525a2f5b6ffe1eda593f86344e0542ac8a14ceab
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 69e476290c -s ours am: a025d830e6 Change-Id: I199f0079097cbd7b8b553a705d973d556d8860a4
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 69e476290c -s ours am skip reason: subject contains skip directive Change-Id: Ia2bf7669ab40996c26e2b0db5fec9387efa1a91b
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: I56e475c71d86aabffda46c53ac5bb37c7f240e36
2020-03-31Remove redundant NOTICE copied from LICENSE. am: cf280aa618 am: 4ee0d8262b ↵Bob Badour
am: 038a2bb49b am: 152e51a05e am: 83cab30d58 Change-Id: I66b19e6f60e46b1cd1dc05198baeb645a81e5724
2020-03-31Remove redundant NOTICE copied from LICENSE. am: cf280aa618 am: 4ee0d8262b ↵Bob Badour
am: 038a2bb49b am: 152e51a05e Change-Id: I88d112498e007960174b8c5eb95d8e1bd34e79b4
2020-03-31Remove redundant NOTICE copied from LICENSE. am: cf280aa618 am: 4ee0d8262b ↵Bob Badour
am: 038a2bb49b Change-Id: I24da524dfd1fb59d96809338d7574d888b97b6b8
2020-03-31Remove redundant NOTICE copied from LICENSE. am: cf280aa618 am: 4ee0d8262bBob Badour
Change-Id: I5a588f20ba00e0e835e7a5bbf70591e933d0c2a3
2020-03-31Remove redundant NOTICE copied from LICENSE. am: cf280aa618 am: 4ee0d8262bBob Badour
Change-Id: I14529731728ab25f180746c455144d05734b32d7
2020-03-31Remove redundant NOTICE copied from LICENSE. am: cf280aa618Bob Badour
Change-Id: Id3090d57fcebdb6a48b28238c036549c366d5dae
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: I7423e6a6f383f0ee30b43896cd8c219e5bcfb39b
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/132998499 Test: Built and checked if the fonts were installed in the correct location in the system image. Change-Id: Iccab67e454ede2b63703c42c8ae589b3f0645091
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: Ic55fb3c3e8676eaed69a53fb5f21c23e8ab68aa0
2019-01-04Initial import of google-fonts/arvoAmin Shaikh
Change-Id: I4bac2fefd227330db9dee48f6628e32a732cd70b Fixes: 122326944 Test: make
2019-01-03Initial empty repositoryDiem Mai
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 19:21:41 +0000