summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6e58bb6344 -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: e02f47dc6b -s ours am skip reason: Change-Id I17dd6b71aa576e98e986dd000cf70429f313ac91 with SHA-1 4ca282809d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I55d8fe8a5878ed867e93b6a6423f231e4389c29c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6e58bb6344 -s oursXin Li
am skip reason: Change-Id I17dd6b71aa576e98e986dd000cf70429f313ac91 with SHA-1 4ca282809d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I96202366e25a7ace049b0e8eba11eabbf52b299f
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: I17dd6b71aa576e98e986dd000cf70429f313ac91 Change-Id: Ic80011c93f84dc3420cfe47a9650e2f144b99e66
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arbutus-slab am: ↵Bob Badour
330bfa2c97 am: 30aa993318 am: cbf4748158 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/1588695 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3f5a6de93e656b7f4b79ed0487996c20128aaf3a
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arbutus-slab am: ↵Bob Badour
330bfa2c97 am: 30aa993318 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/1588695 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I95e3a6f9d9853cc085cf2834e6beb3de3b05bf7c
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arbutus-slab am: ↵Bob Badour
330bfa2c97 Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/1588695 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I990044df0b968183e3bb54be0194287d8d72f07e
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/google-fonts/arbutus-slabandroid-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: Ia6db8776ce16dbe83d01ab38684c201767bc89fe
2020-11-24Mark ab/6881855 as merged am: f8cd8fa859 am: 4ca282809dXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/13111417 Change-Id: I69948a2ccd761d584688b66ff01d6c35dc37f3dc
2020-11-24Mark ab/6881855 as merged am: f8cd8fa859Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/13111417 Change-Id: I17dd6b71aa576e98e986dd000cf70429f313ac91
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I1f2a672465b3c36f774cbbce304a5a438245e4e4
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: ca658b2a22 -s ours am: ↵Xin Li
5143229d31 -s ours am: 42d23274b4 -s ours am skip reason: Change-Id I045cfe79e554db7bbd3a33525ad3275b043b83a4 with SHA-1 022d935b68 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/12795746 Change-Id: Iff427c1b62887b63177080f3503a3c7a37e8a34b
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: ca658b2a22 -s ours am: ↵Xin Li
5143229d31 -s ours am skip reason: Change-Id I045cfe79e554db7bbd3a33525ad3275b043b83a4 with SHA-1 022d935b68 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/12795746 Change-Id: I507bae8c3665584ab0045ac79a7e255665f7857a
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: ca658b2a22 -s oursXin Li
am skip reason: Change-Id I045cfe79e554db7bbd3a33525ad3275b043b83a4 with SHA-1 022d935b68 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/12795746 Change-Id: I2fd2e9cf96dd2628ae075d7eeaaae123603b0682
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I045cfe79e554db7bbd3a33525ad3275b043b83a4 Change-Id: I69089b35195125df48fc99f74d77ef8b35a1f7bd
2020-09-11[automerger skipped] Merge Android R am: 0e9196699b -s ours am: aa5a3115b7 ↵Xin Li
-s ours am: 82e6af7fcd -s ours am: 09501520f0 -s ours am: acb42272ea -s ours am skip reason: Change-Id I748f0c03addce78910b67d3e2a1ee2df633d1595 with SHA-1 f7b16556de is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/1422311 Change-Id: I21ebdadbfbb31750602d9577d631d898f048d11c
2020-09-11[automerger skipped] Merge Android R am: 0e9196699b -s ours am: aa5a3115b7 ↵Xin Li
-s ours am: 82e6af7fcd -s ours am: 09501520f0 -s ours am skip reason: Change-Id I748f0c03addce78910b67d3e2a1ee2df633d1595 with SHA-1 f7b16556de is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/1422311 Change-Id: Ic30dca2cb5fd6c841f55c94415d6b03d2408bd13
2020-09-11[automerger skipped] Merge Android R am: 0e9196699b -s ours am: aa5a3115b7 ↵Xin Li
-s ours am: 82e6af7fcd -s ours am skip reason: Change-Id I748f0c03addce78910b67d3e2a1ee2df633d1595 with SHA-1 f7b16556de is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/1422311 Change-Id: Ibbb173cb26db772772c70785b684ad7902680328
2020-09-11[automerger skipped] Merge Android R am: 0e9196699b -s ours am: aa5a3115b7 ↵Xin Li
-s ours am skip reason: Change-Id I748f0c03addce78910b67d3e2a1ee2df633d1595 with SHA-1 f7b16556de is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/1422311 Change-Id: Ia4906e9d958162ccdb0c775c73157d7e6cbec598
2020-09-11[automerger skipped] Merge Android R am: 0e9196699b -s oursXin Li
am skip reason: Change-Id I748f0c03addce78910b67d3e2a1ee2df633d1595 with SHA-1 f7b16556de is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/1422311 Change-Id: I7974ab9cb979db501809e2dd36545076e737d3ad
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I748f0c03addce78910b67d3e2a1ee2df633d1595 Change-Id: I157b3d7944cc523ec9dfab3a791d2f97d56786b3
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: f7b16556de -s ours am: 695bc30a81 -s ours am: a5aae91534 -s ours am: 3fd23ee5a0 -s ours am skip reason: Change-Id I7b1d8e0b66c85e3e0c45b063ca75ec1bd5ad0480 with SHA-1 5025278686 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/12469673 Change-Id: Ifbd34348afdb761f7a15c1ead6dc17d4b60a8136
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: f7b16556de -s ours am: 695bc30a81 -s ours am: a5aae91534 -s ours am skip reason: Change-Id I7b1d8e0b66c85e3e0c45b063ca75ec1bd5ad0480 with SHA-1 5025278686 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/12469673 Change-Id: Ia2a339cd645f6b3d568b5f8a9477cd22e73740a7
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: f7b16556de -s ours am: 695bc30a81 -s ours am skip reason: Change-Id I7b1d8e0b66c85e3e0c45b063ca75ec1bd5ad0480 with SHA-1 5025278686 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/12469673 Change-Id: Iddf6e1a0289cd36c64b9361cad9883a2a6aa7ce7
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: f7b16556de -s ours am skip reason: Change-Id I7b1d8e0b66c85e3e0c45b063ca75ec1bd5ad0480 with SHA-1 5025278686 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/arbutus-slab/+/12469673 Change-Id: I3b3a3a064cf86da174c1a4f0c11da866f8414c47
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I7b1d8e0b66c85e3e0c45b063ca75ec1bd5ad0480 Change-Id: I748f0c03addce78910b67d3e2a1ee2df633d1595
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: a4585df413 -s ours am: 5025278686 am: 022d935b68 am: 77c297359d -s ours am skip reason: subject contains skip directive Change-Id: I668ffbe8ae565e791a3d1c871091404cbd26c22f
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: a4585df413 -s ours am: 5025278686 am: 022d935b68 Change-Id: Ib76c341862a75ae3e725d45afa6c59322c6284bc
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: a4585df413 -s ours am: 5025278686 Change-Id: I045cfe79e554db7bbd3a33525ad3275b043b83a4
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: a4585df413 -s ours am skip reason: subject contains skip directive Change-Id: I7b1d8e0b66c85e3e0c45b063ca75ec1bd5ad0480
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: I528b29bccd2eacf31ef41cb09d1fd6012fcf0417
2020-03-30Remove redundant NOTICE symbolic link. am: d5a7656599 am: 011c3e8cd2 am: ↵Bob Badour
ef9d98f402 am: 76f80e758c am: da792827ef Change-Id: Ic6a428335654654568fad9d0d985e46f2563de84
2020-03-30Remove redundant NOTICE symbolic link. am: d5a7656599 am: 011c3e8cd2 am: ↵Bob Badour
ef9d98f402 am: 76f80e758c Change-Id: I74656da4e3641199f92cd239c939ef6c06b3caf5
2020-03-30Remove redundant NOTICE symbolic link. am: d5a7656599 am: 011c3e8cd2 am: ↵Bob Badour
ef9d98f402 Change-Id: I5c25b6b227035cbe8766684c88b4625e5a61836d
2020-03-30Remove redundant NOTICE symbolic link. am: d5a7656599 am: 011c3e8cd2Bob Badour
Change-Id: Ieff876b46d7ad32c11968dcd072ee881ccd7de47
2020-03-30Remove redundant NOTICE symbolic link. am: d5a7656599 am: 011c3e8cd2Bob Badour
Change-Id: Ib0d76afce7c2f95ad108716884539dffff64138a
2020-03-30Remove redundant NOTICE symbolic link. am: d5a7656599Bob Badour
Change-Id: Ifddb68abff8edac8322f32e0964fb467edd0a93f
2020-03-25Remove redundant NOTICE symbolic link.Bob Badour
Now that http://aosp/1235427 and http://aosp/1238719 are in, NOTICE symbolic links are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: If56862028248a068c982d336fb8998d24d95e60a
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/133011216 Test: Built and checked if the fonts were installed in the correct location in the system image. Change-Id: Iead1f630ebf9205def351f5dcbde41f03a3548ae
2019-04-02Move ArbutusSlab 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: Id273dce51679a6864f65f030c39c1a42847b342f
2019-01-23Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I39c3d85636813680eccd528892c1e12384773902
2018-12-26Initial import of arbutus-slab.Amin Shaikh
This include ag/5745001 along with Android.mk and fonts.mk. Bug: 121039455 Test: make Change-Id: Idf72f422260cb71ad0909d22f94bcc8bb339fce2
2018-12-18Initial empty repositoryDiem Mai
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 03:57:09 +0000