aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-06-30Merge "Downgrade SuspiciousIndentation lint to a warning" am: 9018e4af87 am: ↵HEADandroid-u-rb-dp-10-gplandroid-u-qpr3-beta-2-gplandroid-u-qpr3-beta-1-gplandroid-u-qpr2-beta-3-gplandroid-u-qpr2-beta-2-gplandroid-u-qpr2-beta-1-gplandroid-u-qpr1-beta-2.2-gplandroid-u-qpr1-beta-1-gplandroid-15-dp-2-gplandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000mastermainandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid-u-rb-dp-10-gplTreehugger Robot
4db9460220 am: 4b361cb8a1 am: 2f2999b7a0 am: e02784b678 Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/2141332 Change-Id: I32379ed643aa2773797db919fd7b0be545e6d10f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30Merge "Downgrade SuspiciousIndentation lint to a warning" am: 9018e4af87 am: ↵android-u-beta-4-gplandroid-u-beta-3-gplandroid-u-beta-2-gplandroid-u-beta-1-gplmain-16k-with-phonesTreehugger Robot
4db9460220 am: 4b361cb8a1 am: 2f2999b7a0 Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/2141332 Change-Id: I9fb5cf191237240cdfdf9146f32eeba5a5923566 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29Merge "Downgrade SuspiciousIndentation lint to a warning" am: 9018e4af87 am: ↵Treehugger Robot
4db9460220 am: 4b361cb8a1 Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/2141332 Change-Id: I9440fc2a41c93e0e823759b88ac31b7bd4d7fd44 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29Merge "Downgrade SuspiciousIndentation lint to a warning" am: 9018e4af87 am: ↵Treehugger Robot
4db9460220 Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/2141332 Change-Id: I3fa7d9026a8ec4a47eed9bf8edf8e5ee3c48d784 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29Merge "Downgrade SuspiciousIndentation lint to a warning" am: 9018e4af87main-16kTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/2141332 Change-Id: Ic0152ed66cca64f5e19b65bc712b2224d56dffc5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29Merge "Downgrade SuspiciousIndentation lint to a warning"Treehugger Robot
2022-06-29Downgrade SuspiciousIndentation lint to a warningCole Faust
Bug: 236431222 Test: Presubmits Change-Id: Ia544b82a063a385fd39b543cfb28f439715a56bc
2022-04-13Merge "Jeff moved to a different team so remove him from OWNERS" am: ↵Treehugger Robot
97a3595670 am: e04a0e2533 am: 4ac4ba2ebf am: 56848f47d1 am: 36dc36513e am: f537318e6c Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/2062467 Change-Id: Ifeb3aacfa7b11784d470611d164a4357cc4cb2ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Jeff moved to a different team so remove him from OWNERS" am: ↵android-t-qpr3-beta-3-gplandroid-t-qpr3-beta-1-gplandroid-t-qpr2-beta-3-gplandroid-t-qpr2-beta-2-gplandroid-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseTreehugger Robot
97a3595670 am: e04a0e2533 am: 4ac4ba2ebf am: 56848f47d1 am: 36dc36513e Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/2062467 Change-Id: I419a857cafe4fd90fca4abfd5f423bedbd0cadcb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Jeff moved to a different team so remove him from OWNERS" am: ↵Treehugger Robot
97a3595670 am: e04a0e2533 am: 4ac4ba2ebf am: 56848f47d1 am: e0fd1ace4f Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/2062467 Change-Id: I83cf862598773836c1007d00e3a7f80c2070d42b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Jeff moved to a different team so remove him from OWNERS" am: ↵Treehugger Robot
97a3595670 am: e04a0e2533 am: 4ac4ba2ebf am: 56848f47d1 Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/2062467 Change-Id: I38b2c04d9f1a95d64dbfff23c4822b698bb7e907 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Jeff moved to a different team so remove him from OWNERS" am: ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010Treehugger Robot
97a3595670 am: e04a0e2533 am: 4ac4ba2ebf am: 56848f47d1 Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/2062467 Change-Id: I7861ea0260dac4614aa22bcc2fc536c505fe97d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Merge "Jeff moved to a different team so remove him from OWNERS" am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devTreehugger Robot
97a3595670 am: e04a0e2533 am: 4ac4ba2ebf Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/2062467 Change-Id: Ic94e95ccb1984a08d377b03af21197c22bf17fbb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12Merge "Jeff moved to a different team so remove him from OWNERS" am: ↵Treehugger Robot
97a3595670 am: e04a0e2533 Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/2062467 Change-Id: I05ba9ce9ea6cce695b30920906bc76e9b8e4ddb1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12Merge "Jeff moved to a different team so remove him from OWNERS" am: 97a3595670Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/2062467 Change-Id: Id921b338bd6d4bd32b8609dbbc8663c13c4c8564 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12Merge "Jeff moved to a different team so remove him from OWNERS"Treehugger Robot
2022-04-12Jeff moved to a different team so remove him from OWNERSXin Li
Change-Id: I453c679cff929f0b063a86c8ea4d1bbbb65579d0
2022-02-10Merge "Demote UnicodeInCode error to warning" am: 04aba7cd55 am: bd5499f46c ↵Cole Faust
am: e205982ecd am: fa1f07bfa6 Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/1971286 Change-Id: I1acfb38a2ffb65dfd47c37ce7e9edc9c77e557f7
2022-02-10Merge "Demote UnicodeInCode error to warning" am: 04aba7cd55 am: bd5499f46c ↵Cole Faust
am: e205982ecd Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/1971286 Change-Id: Ib17d93772e5d40c5566cd72aa454b34185028c9b
2022-02-10Merge "Demote UnicodeInCode error to warning" am: 04aba7cd55 am: bd5499f46cCole Faust
Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/1971286 Change-Id: I4dfe03f9e87963daa414ed40b01f957c106d92e5
2022-02-10Merge "Demote UnicodeInCode error to warning" am: 04aba7cd55Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/1971286 Change-Id: I43d0a78b1e798e37bbcbb6bfb08dd374bd01e536
2022-02-10Merge "Demote UnicodeInCode error to warning"android-t-preview-2android-t-preview-1android-t-beta-3android-t-preview-1Cole Faust
2022-02-03Demote UnicodeInCode error to warningCole Faust
Tag soup uses line feeds in its whitespace, which triggers the UnicodeInCode error. Demote it to a warning. Bug: 190944875 Test: Presubmits Change-Id: I1214314cb08a1744d9c2c817eac53e78836b8d77
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I57bb27101536b9f873bce64660158eef6083e95d
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tagsoup" am: da5022322f am: ↵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-releaseBob Badour
340828ddf5 am: 4cf65ec527 am: d40fb0bb7f Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/1575968 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I92196f033e8f394fa88ef63454860d8693c36728
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tagsoup" am: da5022322f am: ↵Bob Badour
340828ddf5 am: 4cf65ec527 am: d40fb0bb7f Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/1575968 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8b6eb9df62f0676278a408063f68f0b9c9052bb6
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tagsoup" am: da5022322f am: ↵android-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-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Bob Badour
340828ddf5 am: 4cf65ec527 Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/1575968 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If0f6c354de00a42dacc16fe7982e08a3bffc20ae
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tagsoup" am: da5022322f am: ↵Bob Badour
340828ddf5 Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/1575968 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4aa70866a29e151e4d73f75908fdd0406e75ca4e
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tagsoup" am: da5022322fandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/tagsoup/+/1575968 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2fb0fb459b3d010c0493a2992605a6097c2857f9
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/tagsoup"android-s-preview-1Bob Badour
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to external/tagsoupBob Badour
Added SPDX-license-identifier-AFL-3.0 SPDX-license-identifier-Apache-2.0 legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I4454464225d3d1913733a825c2309c6deb7854dc
2020-04-29Merge "Add METADATA to tagsoup: Apache2+AFL=NOTICE" am: 2d5a010e59 am: ↵Treehugger Robot
8d79f4b5de am: 8656ca77e3 am: f392ed6872 am: f51f21f867 Change-Id: Ic9b6042003d1a3a95c410bf7380e91ed014c14cb
2020-04-29Merge "Add METADATA to tagsoup: Apache2+AFL=NOTICE" am: 2d5a010e59 am: ↵Treehugger Robot
8d79f4b5de am: 8656ca77e3 am: f392ed6872 Change-Id: Ic2be2b3c1de702b208fe1bf8988cd7612013aa02
2020-04-29Merge "Add METADATA to tagsoup: Apache2+AFL=NOTICE" am: 2d5a010e59 am: ↵Treehugger Robot
8d79f4b5de am: 8656ca77e3 Change-Id: Ia0d060476400bdd0a80f7599dc953419891269ff
2020-04-29Merge "Add METADATA to tagsoup: Apache2+AFL=NOTICE" am: 2d5a010e59 am: ↵Treehugger Robot
8d79f4b5de Change-Id: I080ca943cca2da4aba159643a550cdb53862eb75
2020-04-29Merge "Add METADATA to tagsoup: Apache2+AFL=NOTICE" am: 2d5a010e59android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: Id16ae1200c4aceba34101536253808850a2338ed
2020-04-29Merge "Add METADATA to tagsoup: Apache2+AFL=NOTICE"Treehugger Robot
2020-04-28Add METADATA to tagsoup: Apache2+AFL=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I1471427970cc974bb92135813a5e659cfd183197
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: e3407853dd -s ours am: 55c2f3b6db am: 1a6937db0f am: e04442a28e -s ours am skip reason: subject contains skip directive Change-Id: I5218fe1cf700fa1068c6c422927ef2ff3f4579c8
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: e3407853dd -s ours am: 55c2f3b6db am: 1a6937db0f Change-Id: I18d33e6b798c9e390acc3e808f3c4b7da4dd7f1f
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: e3407853dd -s ours am: 55c2f3b6db Change-Id: I260a421bdcbaeb9e303e76e0ac0391b390a341fa
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: e3407853dd -s ours am skip reason: subject contains skip directive Change-Id: I4b18ef1a096bf4289a3ffde48f963ac3749ee2d1
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I30a1473c21e61140a5356d94874e6eaca067938e
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: d570da5be8 am: ↵Treehugger Robot
60341532ba am: 0556c26315 am: e164f1779a am: 327a599f41 Change-Id: Ibb27c94b833807b1a0e43fb3823ca4f52f92cc87
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: d570da5be8 am: ↵Treehugger Robot
60341532ba am: 0556c26315 am: e164f1779a Change-Id: I7e0e91c45266a73bb735f4f0026be65e9975de71
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: d570da5be8 am: ↵Treehugger Robot
60341532ba am: 0556c26315 Change-Id: I285e25a5d49c42a4c4aca48707148a5f705c186e
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: d570da5be8 am: ↵Treehugger Robot
60341532ba Change-Id: I4c31f26587fab8e4b47e646cae38b93764e82cf0
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: d570da5be8 am: ↵Treehugger Robot
60341532ba Change-Id: Ic2a15a1dfd1f0abba97729f71596608f48640afa
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE." am: d570da5be8Treehugger Robot
Change-Id: I83255ec3ab6b9eaa8ee21d2ce46142320f72b0f2
2020-03-26Merge "Remove redundant NOTICE copied from LICENSE."Treehugger Robot