aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-21Snap for 7478067 from 2014eb07b4185c22dac7d15c602c4e079074a917 to ↵android-mainline-12.0.0_r86android-mainline-12.0.0_r71android-mainline-12.0.0_r7android-mainline-12.0.0_r60android-mainline-12.0.0_r43android-mainline-12.0.0_r24android-mainline-12.0.0_r116android-mainline-12.0.0_r101android12-mainline-cellbroadcast-releaseandroid-build-team Robot
mainline-cellbroadcast-release Change-Id: I8caa4129752373fef887cdf8da8d7a7604663840
2021-02-21[automerger skipped] Mark ab/7061308 as merged in stage. am: 2dcabc8c56 -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseXin Li
ours am: 134e1e6324 -s ours am: 6420ec756f -s ours am skip reason: Change-Id I9125ad289c9480e7306a071908259e5258843094 with SHA-1 52e4c6e58e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4c4eac31403972f943d828874c558aba5b2cc28d
2021-02-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/sfntly" am: 02f6219c5e am: ↵Bob Badour
0831a477de am: be3a7e9e76 am: eb2905fa8f Original change: https://android-review.googlesource.com/c/platform/external/sfntly/+/1588516 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib3a8553bba10004d902e09637b138c1bd9f7fc7b
2021-02-21[automerger skipped] Mark ab/7061308 as merged in stage. am: 2dcabc8c56 -s ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-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-s-v2-preview-1Xin Li
ours am: 134e1e6324 -s ours am skip reason: Change-Id I9125ad289c9480e7306a071908259e5258843094 with SHA-1 52e4c6e58e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7a9f953e2509a7ad89a5b80acf138ba312e84806
2021-02-21Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/sfntly" am: 02f6219c5e am: ↵Bob Badour
0831a477de am: be3a7e9e76 Original change: https://android-review.googlesource.com/c/platform/external/sfntly/+/1588516 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iba24cc80033e3fd741b2e4164bf70700de09fb8e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2dcabc8c56 -s oursXin Li
am skip reason: Change-Id I9125ad289c9480e7306a071908259e5258843094 with SHA-1 52e4c6e58e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I72cea3607e38a646c441aa6e5881809d4aa18058
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: I9125ad289c9480e7306a071908259e5258843094 Change-Id: I2cc815b93e866a244be2da6c98ef0e40e4df6aa6
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/sfntly" am: 02f6219c5e am: ↵Bob Badour
0831a477de Original change: https://android-review.googlesource.com/c/platform/external/sfntly/+/1588516 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I94eab83e942f57be962adbc5ff444332e5125516
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/sfntly" am: 02f6219c5eBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/sfntly/+/1588516 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I348743d48f5dbad5c9760998348ea2d461a96317
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/sfntly"Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/sfntlyBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-Zlib to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: If2fb4d61c57dc7f5e411546807abed07525da17b
2020-11-25Mark ab/6881855 as merged am: 85df0bbd2c am: 52e4c6e58eXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sfntly/+/13110442 Change-Id: I435d5fb76da0f3d6591839ee66d1112c52e21bd9
2020-11-25Mark ab/6881855 as merged am: 85df0bbd2cXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/sfntly/+/13110442 Change-Id: I9125ad289c9480e7306a071908259e5258843094
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I0b30860b1012dfa6d8259145c4df6304ef1cf7d7
2020-10-30Merge "Upgrade sfntly to 1e7adf313bd9c488a70015f8df8782f7c65e9ce7" am: ↵Haibo Huang
a15ba155bf am: c49984c5d8 am: aff1fbc8ea am: 4a0683d24f Original change: https://android-review.googlesource.com/c/platform/external/sfntly/+/1479549 Change-Id: I8e3ccffee16fbb8936e29b07263f5442944fd686
2020-10-30Merge "Upgrade sfntly to 1e7adf313bd9c488a70015f8df8782f7c65e9ce7" am: ↵Haibo Huang
a15ba155bf am: c49984c5d8 am: aff1fbc8ea Original change: https://android-review.googlesource.com/c/platform/external/sfntly/+/1479549 Change-Id: Iba5a0bc3ad1d4efe11a34f93291b1ec18c947775
2020-10-30Merge "Upgrade sfntly to 1e7adf313bd9c488a70015f8df8782f7c65e9ce7" am: ↵Haibo Huang
a15ba155bf am: c49984c5d8 Original change: https://android-review.googlesource.com/c/platform/external/sfntly/+/1479549 Change-Id: If51261e9313ab0de356e3d361f50a00c6f9006fd
2020-10-30Merge "Upgrade sfntly to 1e7adf313bd9c488a70015f8df8782f7c65e9ce7" am: ↵Haibo Huang
a15ba155bf Original change: https://android-review.googlesource.com/c/platform/external/sfntly/+/1479549 Change-Id: I47852720aa20b9cf89a1e17fde74eaa3e5ae0fd7
2020-10-30Merge "Upgrade sfntly to 1e7adf313bd9c488a70015f8df8782f7c65e9ce7"Haibo Huang
2020-10-30Upgrade sfntly to 1e7adf313bd9c488a70015f8df8782f7c65e9ce7Haibo Huang
Test: make Exempt-From-Owner-Approval: upgrade Change-Id: Id4fd6b6b05ecfc56595dd8cc6f62797383098126
2020-04-24Merge "Add license type: contains zlib is NOTICE license" am: 6f0cb758bf am: ↵Bob Badour
fffe41ea62 am: 05cbaed9df am: 1ced7b9cb0 am: 3a13a8d170 Change-Id: I3ee925e789f9343d4acb36755c42617011dbb26b
2020-04-24Merge "Add license type: contains zlib is NOTICE license" am: 6f0cb758bf am: ↵Bob Badour
fffe41ea62 am: 05cbaed9df am: 1ced7b9cb0 Change-Id: I68bc262b2a75c853b06c28b25c703e8d576f4bf6
2020-04-24Merge "Add license type: contains zlib is NOTICE license" am: 6f0cb758bf am: ↵Bob Badour
fffe41ea62 am: 05cbaed9df Change-Id: Ib626dc519cd1e3f5be0defb81bfa5ebbcf8bd78f
2020-04-24Merge "Add license type: contains zlib is NOTICE license" am: 6f0cb758bf am: ↵Bob Badour
fffe41ea62 Change-Id: I76501332d14466292e987dbbda202530edbfaad8
2020-04-24Merge "Add license type: contains zlib is NOTICE license" am: 6f0cb758bfandroid-r-beta-3android-r-beta-2Bob Badour
Change-Id: I259d854bd7f536f9da62b80e97c31f8d84af05b0
2020-04-24Merge "Add license type: contains zlib is NOTICE license"Bob Badour
2020-04-23Add license type: contains zlib is NOTICE licenseBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I7f07450c7e720f82c2d215842e0b0f12a695416d
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 7fc8937200 -s ours am: f36498714d am: d268869742 am: 531055b388 -s ours am skip reason: subject contains skip directive Change-Id: Iae9b8747170977b9e57b252c52ff5b7e25d8a800
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 7fc8937200 -s ours am: f36498714d am: d268869742 Change-Id: Ib983633e9390a55890ca8042bd4396a675f9f5f1
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 7fc8937200 -s ours am: f36498714d Change-Id: I26ad6fd64c29d8e56a4cfbaad69997763fb3de7d
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 7fc8937200 -s ours am skip reason: subject contains skip directive Change-Id: I62a555645e71a341f2adac1eb4d5540966d7f54b
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I7332cdddcb0e2421853ccffe883e29c730e2f38a
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: 062e0dc4cb am: 8b568db69b ↵Treehugger Robot
am: 0b08dede4b am: 7f26dfd6d8 am: 05e15054c1 Change-Id: I5cfe6ff497a24812ea3109cec74802aeabdeae5f
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: 062e0dc4cb am: 8b568db69b ↵Treehugger Robot
am: 0b08dede4b am: 7f26dfd6d8 Change-Id: I3517808e2f019be6adfbe37e4c174cc732007b20
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: 062e0dc4cb am: 8b568db69b ↵Treehugger Robot
am: 0b08dede4b Change-Id: I314e3f42c513d283aa9b38a3b1ea5e725eafe507
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: 062e0dc4cb am: 8b568db69bTreehugger Robot
Change-Id: I63f742b483c0c8d6c58b276465e99053e22446c5
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: 062e0dc4cb am: 8b568db69bTreehugger Robot
Change-Id: Ib1a8092840a06ba02187f7d43c8947dd3eb9ee2b
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: 062e0dc4cbTreehugger Robot
Change-Id: I583d614618289765adb55bdbee27a1fe330557df
2020-03-26Merge "Remove redundant NOTICE symbolic link."Treehugger Robot
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: I7dc4cc586c33868c931a8c02d7b99543e2098b2a
2019-10-30[automerger skipped] DO NOT MERGE - ↵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-releaseXin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 2d2c9d6d38 am: bc071c31d8 -s ours am skip reason: subject contains skip directive Change-Id: Idc0dde05c9263cf70945e75e5b1a753c97f85874
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: 2d2c9d6d38 Change-Id: Icf41de8801562ac5adeb1243ea2cf3e3c5fc60d7
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: Ief0a1220355a1fce83a79158a9c0b6a03ba81f00
2019-09-16Merge pull request #110 from jfkthame/patch-2upstream-masterCosimo Lupo
Restore space before "Regular" font name suffix
2019-09-16Restore space before "Regular" font name suffixjfkthame
This will revert to earlier behavior of HasName, by including a space when appending "Regular" to a base font name to synthesize a possible full name. (The space appears to have been inadvertently dropped during the migration to UCharString.)
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 22e56c45d6 -s ours am: f00684d330 -s ours am: 393cb7b8e4 -s ours am skip reason: change_id I1088cf8188a276eff855101ff3ee6354ef93ec3b with SHA1 eaf930ea2b is in history Change-Id: Ic3b50187cda07501b16968cc9f3da239c6afcb72
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 22e56c45d6 -s ours am: f00684d330 -s ours am skip reason: change_id I1088cf8188a276eff855101ff3ee6354ef93ec3b with SHA1 eaf930ea2b is in history Change-Id: I9cbb05667cd2e5e2620c47bd1e5a08cdb11e4e9b
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 22e56c45d6 -s ours am skip reason: change_id I1088cf8188a276eff855101ff3ee6354ef93ec3b with SHA1 eaf930ea2b is in history Change-Id: Ib5d7d6ea78abaa1b047a001291a0c4e1a10111aa
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: If621628088df1247aed8297f50d67093c15eed73 Merged-In: I1088cf8188a276eff855101ff3ee6354ef93ec3b
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
60a08a3835 -s ours am: 0b6d055c88 am: 54204c9599 am: 60a5fe5c10 -s ours am skip reason: subject contains skip directive Change-Id: I8e02bde06f36983d7d378c81a4e2beebd4ffc70d
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 12:56:21 +0000