aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-21Snap for 7160059 from 977d20636d82b7312d0cf3d1ba49e83fc582862f to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-releaseandroid-build-team Robot
Change-Id: I2a78b8cba0b21c34d2228a0b0c5d0d49bcfa8988
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 04b7c3ad1f -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: 10820fb3bb -s ours am skip reason: Change-Id Ib1f4f7a64d45ceff6b55a277af0cdd8dc883026d with SHA-1 f13ad4bb8b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7a4b004817095caabcba9b9ab600360e630290c6
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 04b7c3ad1f -s oursXin Li
am skip reason: Change-Id Ib1f4f7a64d45ceff6b55a277af0cdd8dc883026d with SHA-1 f13ad4bb8b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6dc966609f721b3f59c3cabf88226dc43e81c107
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: Ib1f4f7a64d45ceff6b55a277af0cdd8dc883026d Change-Id: Ibb5131aa886cb75a22bff8ca2c2a5349a1370a1f
2021-02-18Snap for 7152399 from b81fb6b4c514ca8407e09da2ed43e8aa70faf6a1 to sc-d1-releaseandroid-build-team Robot
Change-Id: I8dfa57f1362b479038aeb18592f11dba0c59f967
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/karla am: 855061d376 ↵Bob Badour
am: 0a82c0c153 am: bcabd36e2d Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1588697 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I669b5b719825b45f565ad94f321074ac5a020f61
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/karla am: 855061d376 ↵Bob Badour
am: 0a82c0c153 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1588697 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibdb378796c48eaa603a5627ceaf63a3b6b545f36
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/karla am: 855061d376Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1588697 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If3ec2f4e205ff0b2816dbe1807ebd2a7a29abff9
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/karlaandroid-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: I09f21e31c635c0cf51fe817507bba418c93b60ed
2020-12-11Snap for 7026311 from 1552f00e866ca198b90ef78c7b1322a66dd655e8 to sc-d1-releaseandroid-build-team Robot
Change-Id: I0b764ffcb3aecac5978e1b1bb44fd96502302bf5
2020-12-10[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 065e95f785 -s ↵Xin Li
ours am: a88f262df8 -s ours am: f13ad4bb8b -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1520884 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1ef6f5459004ba6eb1739f21c68eb4ccfc5a0e9e
2020-12-10[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 065e95f785 -s ↵Xin Li
ours am: a88f262df8 -s ours am skip reason: Change-Id I52bfb3e6c7fb46fe70046a0db9b1c0de41a643e1 with SHA-1 c93e51eacf is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1520884 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib1f4f7a64d45ceff6b55a277af0cdd8dc883026d
2020-12-10[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 065e95f785 -s oursXin Li
am skip reason: Change-Id I52bfb3e6c7fb46fe70046a0db9b1c0de41a643e1 with SHA-1 c93e51eacf is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1520884 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id95a3dfe536041aedffb4af465e1d1eeff730c2d
2020-12-08DO NOT MERGE - Merge Android R QPR1Xin Li
Bug: 172690556 Merged-In: I52bfb3e6c7fb46fe70046a0db9b1c0de41a643e1 Change-Id: I49ab67ab08c920dd84bed21e02a8593f0f7879f7
2020-12-04Snap for 7010700 from e1681abc51404269ff374f83bdb2a1024cda7357 to sc-d1-releaseandroid-build-team Robot
Change-Id: I819489b4dbaef59691eb5c97a954f5ead219cca2
2020-12-03[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ↵Xin Li
c93e51eacf -s ours am: 4bc4c9c361 -s ours am skip reason: Change-Id I72c68d007e8837b826b67502ece166714095ebf3 with SHA-1 2de1fb3e83 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/karla/+/13121544 Change-Id: I850325380ba4875a1529c6f3ca5ef2692f666420
2020-12-03[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ↵Xin Li
c93e51eacf -s ours am skip reason: Change-Id I72c68d007e8837b826b67502ece166714095ebf3 with SHA-1 2de1fb3e83 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/karla/+/13121544 Change-Id: I459e92ed7d50f1bcdf4c5621bb43523e4a76857d
2020-11-23Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855temp_rvc_qpr_mergeXin Li
Bug: 172690556 Merged-In: I72c68d007e8837b826b67502ece166714095ebf3 Change-Id: I52bfb3e6c7fb46fe70046a0db9b1c0de41a643e1
2020-10-21Snap for 6919570 from 930696a5d15d968bb04949758319ac60c932ed14 to sc-d1-releaseandroid-build-team Robot
Change-Id: I45246e600b9e93a24e170e892d61477a16b41fe4
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 5b79c3ed2d -s ours ↵Xin Li
am: c76e282c6a -s ours am: 0847f76a2d -s ours am: 3c234306eb -s ours am: a178663b9c -s ours am skip reason: Change-Id I997f5f93b9221528d6e03d1a53e271cf40e2a060 with SHA-1 f90d8b3d84 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1465763 Change-Id: I7d7cb2d231392f2ff9d529e7f5aa01505a1ffb0c
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 5b79c3ed2d -s ours ↵Xin Li
am: c76e282c6a -s ours am: 0847f76a2d -s ours am: 3c234306eb -s ours am skip reason: Change-Id I997f5f93b9221528d6e03d1a53e271cf40e2a060 with SHA-1 f90d8b3d84 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1465763 Change-Id: Idb0e73bf18c14b668e3090d202cee605d7f8ac10
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 5b79c3ed2d -s ours ↵Xin Li
am: c76e282c6a -s ours am: 0847f76a2d -s ours am skip reason: Change-Id I997f5f93b9221528d6e03d1a53e271cf40e2a060 with SHA-1 f90d8b3d84 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1465763 Change-Id: I884d807d5728761ef2a41df20c4fe84f276051b1
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 5b79c3ed2d -s ours ↵Xin Li
am: c76e282c6a -s ours am skip reason: Change-Id I997f5f93b9221528d6e03d1a53e271cf40e2a060 with SHA-1 f90d8b3d84 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1465763 Change-Id: I06a7ff1b5270aac0e2f168bf48033ddbf06134db
2020-10-20[automerger skipped] Merge redfin/bramble support. am: 5b79c3ed2d -s oursXin Li
am skip reason: Change-Id I997f5f93b9221528d6e03d1a53e271cf40e2a060 with SHA-1 f90d8b3d84 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1465763 Change-Id: I0af781dc9aa6c4502966266ae1e8c66a992d7b19
2020-10-19Merge redfin/bramble support.Xin Li
Bug: 171218636 Merged-In: I997f5f93b9221528d6e03d1a53e271cf40e2a060 Change-Id: I0ff933545ace32a418eb643d8383de51e66a0d54
2020-10-14Snap for 6903824 from ada5c79b40680323fe4e4bd74f1aaca4528ddc99 to sc-d1-releaseandroid-build-team Robot
Change-Id: I60320ced12055083a2ac979444c6be6327caf3a9
2020-10-13[automerger skipped] Merge ab/6749736 in stage. am: f90d8b3d84 -s ours am: ↵Xin Li
d2def5d9ba -s ours am: 1365443392 -s ours am: 239dc182da -s ours am skip reason: Change-Id I7fda30eb7ba4450dd524ff2e4084e562335eab03 with SHA-1 5d22d2d3ef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/karla/+/12804431 Change-Id: Ibe670efd0a0f78659cbe141a09858fcb7cd54e91
2020-10-13[automerger skipped] Merge ab/6749736 in stage. am: f90d8b3d84 -s ours am: ↵Xin Li
d2def5d9ba -s ours am: 1365443392 -s ours am skip reason: Change-Id I7fda30eb7ba4450dd524ff2e4084e562335eab03 with SHA-1 5d22d2d3ef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/karla/+/12804431 Change-Id: I817b690a56c0d1313e3b1e158c604cce4a5a442a
2020-10-13[automerger skipped] Merge ab/6749736 in stage. am: f90d8b3d84 -s ours am: ↵Xin Li
d2def5d9ba -s ours am skip reason: Change-Id I7fda30eb7ba4450dd524ff2e4084e562335eab03 with SHA-1 5d22d2d3ef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/karla/+/12804431 Change-Id: I63c9d726900d29a4713472246602118fa2b93dab
2020-10-13[automerger skipped] Merge ab/6749736 in stage. am: f90d8b3d84 -s oursXin Li
am skip reason: Change-Id I7fda30eb7ba4450dd524ff2e4084e562335eab03 with SHA-1 5d22d2d3ef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/karla/+/12804431 Change-Id: Id35f178caa1e26f276addac289748ec1ceb54e09
2020-10-08Merge ab/6749736 in stage.Xin Li
Bug: 167233921 Merged-In: I7fda30eb7ba4450dd524ff2e4084e562335eab03 Change-Id: I997f5f93b9221528d6e03d1a53e271cf40e2a060
2020-09-22Snap for 6852980 from f5177113f069dfbc06a2a7f67d06e1423e6f4d5a to sc-d1-releaseandroid-build-team Robot
Change-Id: I3b17a5f6b862ca01cf6a85d5bbe17c90d9755e0e
2020-09-21[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: 1167dff97a am: 2bc33f66a9 -s ours am: 96ae9e3528 -s ours am: a335c1f83c -s ours am: 2de1fb3e83 -s ours am: a0388ed9ae -s ours am skip reason: Change-Id I602373f15230605028687b442f0ed7f98131614a with SHA-1 fb4fd5ed26 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1430116 Change-Id: I05019982b17f068f296ff02870bbdc437ad9ea69
2020-09-21[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: 1167dff97a am: 2bc33f66a9 -s ours am: 96ae9e3528 -s ours am: a335c1f83c -s ours am: 2de1fb3e83 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1430116 Change-Id: I7a8a5635eca3ecdad9d0247ac8e0e0850b8dfdc2
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: 1167dff97a am: 2bc33f66a9 -s ours am: 96ae9e3528 -s ours am: a335c1f83c -s ours am skip reason: Change-Id I602373f15230605028687b442f0ed7f98131614a with SHA-1 fb4fd5ed26 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1430116 Change-Id: I72c68d007e8837b826b67502ece166714095ebf3
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: 1167dff97a am: 2bc33f66a9 -s ours am: 96ae9e3528 -s ours am skip reason: Change-Id I602373f15230605028687b442f0ed7f98131614a with SHA-1 fb4fd5ed26 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1430116 Change-Id: I87b59fed0a4c82fb17031ef34cc094504e1d7bd6
2020-09-19[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE ↵Bill Yi
am: 1167dff97a am: 2bc33f66a9 -s ours am skip reason: Change-Id I602373f15230605028687b442f0ed7f98131614a with SHA-1 fb4fd5ed26 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1430116 Change-Id: Ib11f7aa5e640d1024328b5a25a8669235cd9a0cf
2020-09-19Merge mainline-release 6664920 to master - DO NOT MERGE am: 1167dff97aBill Yi
Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1430116 Change-Id: Ifb819b59fe169ddd1852b83ee3456ce2fdb51009
2020-09-17Merge mainline-release 6664920 to master - DO NOT MERGEplatform-tools-30.0.5Bill Yi
Merged-In: I602373f15230605028687b442f0ed7f98131614a Change-Id: Idc2ae4ddcfbb90ad98cf895924dac602b9ec5d5e
2020-09-16Snap for 6838697 from cabecb63a248020887855f7866115fc195d79d4c to sc-d1-releaseandroid-build-team Robot
Change-Id: I8b08f68986e077b96dffd1924836e6105fb14508
2020-09-15[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: 363d6ec3ec -s ours am: fb4fd5ed26 -s ours am: a3cb3139d7 -s ours am: 010933c17a -s ours am: 5ab5569fc4 -s ours am skip reason: Change-Id Ie6332cbba92131c35adae5a28556560d3a42ee47 with SHA-1 d0ebdf6b15 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/karla/+/12579403 Change-Id: Ia2adaae893bc9a15234e1c7356a8c0fbd08aaa42
2020-09-15[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: 363d6ec3ec -s ours am: fb4fd5ed26 -s ours am: a3cb3139d7 -s ours am: 010933c17a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/karla/+/12579403 Change-Id: I09db67b99320b99238aca7d15c6d65b88de78f10
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: 363d6ec3ec -s ours am: fb4fd5ed26 -s ours am: a3cb3139d7 -s ours am skip reason: Change-Id Ie6332cbba92131c35adae5a28556560d3a42ee47 with SHA-1 d0ebdf6b15 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/karla/+/12579403 Change-Id: I1e2e25d9e8a04cd835a036dfcdc54c9ac3d3a3e4
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: 363d6ec3ec -s ours am: fb4fd5ed26 -s ours am skip reason: Change-Id Ie6332cbba92131c35adae5a28556560d3a42ee47 with SHA-1 d0ebdf6b15 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/karla/+/12579403 Change-Id: Iaf693eb88eb2c6c580034a75a25fe8cdef8b2b29
2020-09-14[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - ↵Bill Yi
DO NOT MERGE am: 363d6ec3ec -s ours am skip reason: Change-Id Ie6332cbba92131c35adae5a28556560d3a42ee47 with SHA-1 d0ebdf6b15 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/karla/+/12579403 Change-Id: I602373f15230605028687b442f0ed7f98131614a
2020-09-13Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGEBill Yi
Merged-In: Ie6332cbba92131c35adae5a28556560d3a42ee47 Change-Id: Ic4beb5c5ca7e2aa926bcda243e56cc71d5618cab
2020-09-02Snap for 6807104 from 1bb4e83353b94d6cae4c4c4f81e7cbdd595a4eb8 to sc-d1-releaseandroid-build-team Robot
Change-Id: I77eb5394c8b273f75815d2edeb6abb031dfd4561
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3d44a51c6d -s ours am: d0ebdf6b15 -s ours am: 22e8e76774 -s ours am: b446d33fa7 -s ours am: e10429ad16 -s ours am skip reason: Change-Id If70d13033a3abca3662fe226246144adf8a6e057 with SHA-1 178a15fbda is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/karla/+/12470010 Change-Id: If5239084a091e4a40a30f50ee5cb3788cfaa2580
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3d44a51c6d -s ours am: d0ebdf6b15 -s ours am: 22e8e76774 -s ours am: b446d33fa7 -s ours am skip reason: Change-Id If70d13033a3abca3662fe226246144adf8a6e057 with SHA-1 178a15fbda is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/karla/+/12470010 Change-Id: I4992f1d85ab89ca6b2aaa3a2d36daba241a9e235
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3d44a51c6d -s ours am: d0ebdf6b15 -s ours am: 22e8e76774 -s ours am skip reason: Change-Id If70d13033a3abca3662fe226246144adf8a6e057 with SHA-1 178a15fbda is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/karla/+/12470010 Change-Id: Ib6808fde59acfd2953802a56a796bcd7c4afd5f9
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 11:40:22 +0000