aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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: I20595bd3406ce31f03d3c0cddc8bb95e7ca9c4f9 Change-Id: Ib4979046043129b5cb7e3c7450847cabf53cb0a6
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/fraunces am: 2c1b5c8d8cBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1588660 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifd2e6a616bd6e1d5639b14cd536b06e50ac814b7
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/frauncesandroid-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: I7a54d33334fa3f3dff0738e6c09e5f2d89b5cc42
2020-11-24Mark ab/6881855 as merged am: 3647f69281Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/13112758 Change-Id: I20595bd3406ce31f03d3c0cddc8bb95e7ca9c4f9
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ie53a0f132c6576647a54de9ea6ce34b72d3944c6
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 9403909a58 -s ours ↵Xin Li
am: e866bdd79d -s ours am: bf075590e6 -s ours am skip reason: Change-Id I782dbed16ee6ce69665380c0d8b801f62ed2cd4b with SHA-1 5ca07135eb is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1466366 Change-Id: Iefb060b46f0df72a08f8c3c6c3c3a91e3b436a99
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 9403909a58 -s ours ↵Xin Li
am: e866bdd79d -s ours am skip reason: Change-Id I782dbed16ee6ce69665380c0d8b801f62ed2cd4b with SHA-1 5ca07135eb is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1466366 Change-Id: I311bf5c305eaf0c5d60aa74a4f391657611ac37e
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 9403909a58 -s oursXin Li
am skip reason: Change-Id I782dbed16ee6ce69665380c0d8b801f62ed2cd4b with SHA-1 5ca07135eb is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1466366 Change-Id: If4fe7aa0897d494ca521c73fed0e45bff7e16a4b
2020-10-19Merge redfin/bramble support.Xin Li
Bug: 171218636 Merged-In: I782dbed16ee6ce69665380c0d8b801f62ed2cd4b Change-Id: I8aabdcf04fb8b4bc4faa8b280a9c62c786b1fd7c
2020-10-13[automerger skipped] Merge ab/6749736 in stage. am: 5ca07135eb -s ours am: ↵Xin Li
44cc05aadb -s ours am skip reason: Change-Id I5dd32cab862873deb9cc40f38443676a43e8e95f with SHA-1 38a8eebb60 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/12804167 Change-Id: Iff8b15c274d1f5454576b8c7b0db4527399f6cc6
2020-10-13[automerger skipped] Merge ab/6749736 in stage. am: 5ca07135eb -s oursXin Li
am skip reason: Change-Id I5dd32cab862873deb9cc40f38443676a43e8e95f with SHA-1 38a8eebb60 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/12804167 Change-Id: Ib96408438831491bc8d33cdbfd292d413bfd6ed9
2020-10-09Merge ab/6749736 in stage.Xin Li
Bug: 167233921 Merged-In: I5dd32cab862873deb9cc40f38443676a43e8e95f Change-Id: I782dbed16ee6ce69665380c0d8b801f62ed2cd4b
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: 463be1d0c1 am: 0936a1c8c6 -s ours am: 6640f8698f -s ours am: 4821dd51b4 -s ours am skip reason: Change-Id Ia5f1758ee7036f5d18a2216b383854b9c2412fae with SHA-1 22573bf6d6 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1431514 Change-Id: I50426337632f43698b930c3aa3740bdf35791929
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: 463be1d0c1 am: 0936a1c8c6 -s ours am: 6640f8698f -s ours am skip reason: Change-Id Ia5f1758ee7036f5d18a2216b383854b9c2412fae with SHA-1 22573bf6d6 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1431514 Change-Id: Ie143e7f70bd1323cc66a445d6d09ab6e3874a479
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: 463be1d0c1 am: 0936a1c8c6 -s ours am skip reason: Change-Id Ia5f1758ee7036f5d18a2216b383854b9c2412fae with SHA-1 22573bf6d6 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1431514 Change-Id: I02f0800880b3629be78d9e4656ac6da705b0c82e
2020-09-19Merge mainline-release 6664920 to master - DO NOT MERGE am: 463be1d0c1Bill Yi
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/1431514 Change-Id: I0d81bf1f113072801eb484c668e923ae37449350
2020-09-17Merge mainline-release 6664920 to master - DO NOT MERGEplatform-tools-30.0.5Bill Yi
Merged-In: Ia5f1758ee7036f5d18a2216b383854b9c2412fae Change-Id: Iccf21e92087a849f85022b0b19996d8c1f09347f
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: eb4040cfac -s ours am: 22573bf6d6 -s ours am: 4225f9d79a -s ours am skip reason: Change-Id I2c587dc8fda0c48f07569b3f8ddd44a8825a2a54 with SHA-1 5c2dd362eb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/12579277 Change-Id: I082979a8aa851ee178576558cae6ff4dd8c89259
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: eb4040cfac -s ours am: 22573bf6d6 -s ours am skip reason: Change-Id I2c587dc8fda0c48f07569b3f8ddd44a8825a2a54 with SHA-1 5c2dd362eb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/12579277 Change-Id: If8f85cb78e461e220afcbb78f5d5e799ab57842c
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: eb4040cfac -s ours am skip reason: Change-Id I2c587dc8fda0c48f07569b3f8ddd44a8825a2a54 with SHA-1 5c2dd362eb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/12579277 Change-Id: Ia5f1758ee7036f5d18a2216b383854b9c2412fae
2020-09-13Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGEBill Yi
Merged-In: I2c587dc8fda0c48f07569b3f8ddd44a8825a2a54 Change-Id: I7da3fab5272933bbd6d07fcdaab4e1cfe9645ea6
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 88266c030a -s ours am: 5c2dd362eb -s ours am: de0b3ac58c -s ours am skip reason: Change-Id Ibf8471634da6ec3333cda0c0a913cbf70ac8340a with SHA-1 5059f21113 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/12470111 Change-Id: If8deb171adef2b1d87661a76d1fb36ace9da02f5
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 88266c030a -s ours am: 5c2dd362eb -s ours am skip reason: Change-Id Ibf8471634da6ec3333cda0c0a913cbf70ac8340a with SHA-1 5059f21113 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/12470111 Change-Id: Ib88c6ce4de41f20058d9a8165c215be32952a5f1
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 88266c030a -s ours am skip reason: Change-Id Ibf8471634da6ec3333cda0c0a913cbf70ac8340a with SHA-1 5059f21113 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/fraunces/+/12470111 Change-Id: I2c587dc8fda0c48f07569b3f8ddd44a8825a2a54
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li
Bug: 166295507 Merged-In: Ibf8471634da6ec3333cda0c0a913cbf70ac8340a Change-Id: I44257d82eca90bafa3a1ae56c773db788c2fa905
2020-05-20Remove new styles from AOSP am: 04d81baaac am: b98b9c56cdJay Aliomer
Change-Id: Ic27a94afe44e40110c02f284048c8d26a2a3af17
2020-05-20Remove new styles from AOSP am: 04d81baaac am: 38a8eebb60Jay Aliomer
Change-Id: I02f36cced6a37fc87f0d93579dc7f3745969180f
2020-05-20Remove new styles from AOSP am: 04d81baaacJay Aliomer
Change-Id: I5dd32cab862873deb9cc40f38443676a43e8e95f
2020-05-20Remove new styles from AOSP am: 04d81baaacandroid-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: Iaf80cd779b104bdb55d96c11a666875de31771a5
2020-05-15Remove new styles from AOSPandroid-11.0.0_r16android11-d1-b-releaseJay Aliomer
Fixes: 156779458 Test: manually check styles" Change-Id: I53e96f122b084c0d4203d5b922309742878d8f7f
2020-05-06Snap for 6465939 from edf20d560623c84e4d452151c99a5f910e6ada82 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: Id0463990d6af86b61344883f0eafec15264c9e07
2020-04-29Snap for 6441286 from b721b4454f9e88e29465eee181c87819565b2a08 to ↵android-build-team Robot
mainline-release Change-Id: Ie6b1c5387da04bb440ddabd4dd14c57eb5857f7c
2020-04-28Adding style packages/fonts am: 89691f625d am: ecff51463b am: b721b4454fJay Aliomer
Change-Id: I8b283336e3f6b4ee957bc7a9cabeed308cdd987e
2020-04-28Adding style packages/fonts am: 89691f625d am: a929092878Jay Aliomer
Change-Id: Idd16c2f48c305810cb30b2d33f9616d80e5ce650
2020-04-28Adding style packages/fonts am: 89691f625d am: ecff51463bJay Aliomer
Change-Id: I9f8f389cf01eef46e45f98ee1704c1156456648d
2020-04-28Adding style packages/fonts am: 89691f625dJay Aliomer
Change-Id: I879c521cdf9b4aeec7343f81843345ddc29a5c4d
2020-04-28Adding style packages/fonts am: 89691f625dJay Aliomer
Change-Id: I44aba2badfc0b9a1cbb1ae79f9c540bc025774c3
2020-04-28Adding style packages/fontsJay Aliomer
adding the pixel 2020 styles and fonts Bug: 145530620 Bug: 145529629 Test: test the styles app Change-Id: I886e01aa9eec3389433a80b3f41f346cf21e6225
2020-04-19Snap for 6408566 from da0c648e0e3bbfab9441f4a2128e8284e50df631 to ↵android-build-team Robot
mainline-release Change-Id: I5fdaca4a4e91e4d78004c41667da5436c434c00d
2020-04-17Import external/google-fonts/fraunces am: edf20d5606 am: 3ed07dd467 am: ↵Jay Aliomer
8e443cde87 am: da0c648e0e Change-Id: I56aa83af0cc0039a9e73015957c86697776e653c
2020-04-17Import external/google-fonts/fraunces am: edf20d5606 am: 3ed07dd467 am: ↵Jay Aliomer
8e443cde87 Change-Id: I8467f42db21f762fe9ece8a24fce74ec13690e5d
2020-04-17Import external/google-fonts/fraunces am: edf20d5606 am: 3ed07dd467 am: ↵Jay Aliomer
ddd6577ef5 Change-Id: Iaa45a72074f9d2fd3f38b2e2880c279f62424a57
2020-04-17Import external/google-fonts/fraunces am: edf20d5606 am: 5059f21113 am: ↵Jay Aliomer
83476e218e Change-Id: Ibb428ee5891fe8f312a3b15a747cbc499c74432a
2020-04-17Import external/google-fonts/fraunces am: edf20d5606 am: 3ed07dd467Jay Aliomer
Change-Id: I8fe283d78bf4f7a0031be314b3d2b8f1eb4e7229
2020-04-17Import external/google-fonts/fraunces am: edf20d5606 am: 5059f21113Jay Aliomer
Change-Id: I03f01ae441c80ac60c6bad607f938da79e472801
2020-04-17Import external/google-fonts/fraunces am: edf20d5606 am: 3ed07dd467Jay Aliomer
Change-Id: I797461482ddf7c2b1e928b635f717a0c0396d4eb
2020-04-17Import external/google-fonts/fraunces am: edf20d5606Jay Aliomer
Change-Id: Ibf8471634da6ec3333cda0c0a913cbf70ac8340a
2020-04-17Import external/google-fonts/fraunces am: edf20d5606Jay Aliomer
Change-Id: I693eeff702455b8b0e8656e8813defe3817c8bc6
2020-04-16Import external/google-fonts/frauncesandroid-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_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_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-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_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_r12android11-mainline-tethering-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-devJay Aliomer
source_repository_url: "user/aaliomer/font-fraunces" source_branch: "master" source_tip_commit: "8faeaf7522fecbe9c8d89c88c934cfe376018d94" target_repository_name: "external/google-fonts/fraunces" Test: none Bug: 145530620 Change-Id: Ia40d49470baffa02abfd00c28c30278ec08c4c80
2020-03-23Initial empty repositoryThomas Joseph Avila
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 08:37:05 +0000