aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jdiff" am: 75558173f8 am: ↵android-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-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-1Bob Badour
163b29f97f am: b03edc3e2b Original change: https://android-review.googlesource.com/c/platform/external/jdiff/+/1588800 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie38f559424ee32b2bdb548df184df33e882a2027
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jdiff" am: 75558173f8 am: ↵Bob Badour
163b29f97f Original change: https://android-review.googlesource.com/c/platform/external/jdiff/+/1588800 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic9d9b5d981eb21ad2c76a7db821c5f9b5f9d6115
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jdiff" am: 75558173f8android-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/jdiff/+/1588800 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I271d9278f479c803d6c3e59a2915d7cab15db9b4
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/jdiff"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/jdiffBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-CC-BY SPDX-license-identifier-GPL SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ief2281f29448ec660ad33c48604f95bd45fe2db3
2020-04-28Merge "Add METADATA to jdiff: LGPL+GPL=RESTRICTED" am: a62cf319f0 am: ↵Treehugger Robot
1508d2b9c7 am: 95d5f57b36 am: 5ae69e87ab am: 2545b2cabc Change-Id: I339f8d9b0fcd6990c0f96d5d982b42005eb54923
2020-04-28Merge "Add METADATA to jdiff: LGPL+GPL=RESTRICTED" am: a62cf319f0 am: ↵Treehugger Robot
1508d2b9c7 am: 95d5f57b36 am: 5ae69e87ab Change-Id: Ia87ece0e1593c8d14dafd9d45277f278d0197cc0
2020-04-28Merge "Add METADATA to jdiff: LGPL+GPL=RESTRICTED" am: a62cf319f0 am: ↵Treehugger Robot
1508d2b9c7 am: 95d5f57b36 Change-Id: Ic54b22d98667687e6fa1eb395e7ff962a3b0622e
2020-04-28Merge "Add METADATA to jdiff: LGPL+GPL=RESTRICTED" am: a62cf319f0 am: 1508d2b9c7Treehugger Robot
Change-Id: I89a037d4d5829c290d9b950e8690d59a54bd9592
2020-04-28Merge "Add METADATA to jdiff: LGPL+GPL=RESTRICTED" am: a62cf319f0Treehugger Robot
Change-Id: I3607dd13c91ad83ebc8848ef4afe2b9498a2e0ba
2020-04-28Merge "Add METADATA to jdiff: LGPL+GPL=RESTRICTED"Treehugger Robot
2020-04-28Add METADATA to jdiff: LGPL+GPL=RESTRICTEDBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ifa504a197f9cc12b7552835e484ed680328df85c
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: fde1ff01f6 am: 5c12f0c675 -s ours am skip reason: subject contains skip directive Change-Id: Ib0435eae24f5ae4f5454c8b6e34bf23f87a94036
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: fde1ff01f6 Change-Id: I3ac49c5e0a1b4345ca0396d8a81829d6592e2d7f
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master Bug: 142003500 Change-Id: If310ba869cd14cb05197d874ea90c3176c0ecbb6
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 3826203ca6 -s ours am: f522dd14c9 -s ours am: 481ccb8c0b -s ours am skip reason: change_id I5f3596d149f2f4319f780b43f38a1967a6ca2f51 with SHA1 2e4ef0bce9 is in history Change-Id: I830289632cfbec319a22f269eab07b7a860a4e8d
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 3826203ca6 -s ours am: f522dd14c9 -s ours am skip reason: change_id I5f3596d149f2f4319f780b43f38a1967a6ca2f51 with SHA1 2e4ef0bce9 is in history Change-Id: I83711bb837b18438e42d6f76986a9a6d8772b4a5
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 3826203ca6 -s ours am skip reason: change_id I5f3596d149f2f4319f780b43f38a1967a6ca2f51 with SHA1 2e4ef0bce9 is in history Change-Id: Ie5fb78f2f158504959cdb6f5ea7743a45146335a
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: Ic83ac9fe78ad277f06f9ee5952c57c919c3693ce Merged-In: I5f3596d149f2f4319f780b43f38a1967a6ca2f51
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
6176b78314 -s ours am: 85e165aec9 am: 0a7ecda996 am: d3980d0ce5 -s ours am skip reason: subject contains skip directive Change-Id: I4fa82ecfb1bef2d685850ec54e6b93e14df57952
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
6176b78314 -s ours am: 85e165aec9 am: 0a7ecda996 Change-Id: I2579b7c66a8616d433fe000f1189def85efc5f7f
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
6176b78314 -s ours am: 85e165aec9 Change-Id: I22c839a36178632cf82c39d3acbbef3b9d1a2eb5
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: 6176b78314 -s ours am skip reason: subject contains skip directive Change-Id: I5c1512778a32016e6202d427733282e1186219ea
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: I5f3596d149f2f4319f780b43f38a1967a6ca2f51
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 86be9d5e7b am: abad1baa61 -s ours am skip reason: subject contains skip directive Change-Id: I9ba5c7f43dbd9cc7952b9f4e2bc430932a455100
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 86be9d5e7b Change-Id: I34db45d603e77ffc3eefc9290cbcfa15668ed1f3
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I4b6050e8762d256cfef75a8b6bad8bcdbcf9d151
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-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_r12android10-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-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 57c0d2d54d Change-Id: I2c1d007fd31301d8e8815e890b5e4bcbb4b810d6
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I4d8f1116bee5544882bfc9a0dfb497590332e9c0
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: Ib1bcf352079c36a81dfb676795cafc6c91f6a9a3
2019-02-13Merge "Ignore Gradle temp files in jdiff" am: 0be98884b3 am: b0dfb93378Chris Banes
am: 4fd2725556 Change-Id: Ied21c54220a093eac2137ee93a56b166a54e987d
2019-02-13Merge "Ignore Gradle temp files in jdiff" am: 0be98884b3Chris Banes
am: b0dfb93378 Change-Id: Ia4104c93eed028d209be40e524bbfd8bb99e8b97
2019-02-13Merge "Ignore Gradle temp files in jdiff"Chris Banes
am: 0be98884b3 Change-Id: I2ae46bbaafcbe3b879281b7d87a69f69811116b3
2019-02-13Merge "Ignore Gradle temp files in jdiff"androidx-transition-releaseandroidx-loader-releaseandroidx-lifecycle-releaseandroidx-enterprise-releaseandroidx-collection-releaseandroidx-annotation-releaseTreehugger Robot
2019-02-13Ignore Gradle temp files in jdiffChris Banes
Test: files are gone in git Change-Id: I69b186583a28dc380f5cc5be60f0f40d5b79e88b
2019-01-11Merge "Add default code reviewers into OWNERS" am: d6366071de am: 7686be8cafChih-hung Hsieh
am: 40f9788aa2 Change-Id: Icb099cff463eac5b93347b0f2d83afb338354d2e
2019-01-11Merge "Add default code reviewers into OWNERS" am: d6366071deChih-hung Hsieh
am: 7686be8caf Change-Id: I3bce82456bd5d4ea3bdf9a2a25f588a50a42187b
2019-01-11Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: d6366071de Change-Id: I3fdc434a3ebb94587a3aaeac21ce574581171d6f
2019-01-11Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
2019-01-10Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I9e978aa5293ed52258c726da67a0f2bb895b7d5c
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 5db7586e8d -s ours am: 92dd4816fd -s ours am: 806b5dff84 -s ours Change-Id: I97f38206015ff665a1c5f2242da944a92f423332
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 5db7586e8d -s ours am: 92dd4816fd -s ours Change-Id: If3d81fd7137c35c09cbf57b9af430f2ecc5dc74b
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 5db7586e8d -s ours Change-Id: I829e548b9d05c1d19f55774d497d90fa5f9ced35
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
Change-Id: If5d90c51cea861afbe60ca43e90f88052fdbdf00
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: cd29a5a99a -s ours am: 2b4baf40db -s ours Change-Id: I0c3ecf62577c863a1cb58dd5f5eccc568ed880a0
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: cd29a5a99a -s ours Change-Id: I3bb745efc99b625d2a2dbb3fa29e3a21025dc48c
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I6312b972019a5d98f9466faf83a958de2fe9657d
2018-09-18Merge "Convert jdiff to Soong" am: 9335763d33 am: fa10df3198Nan Zhang
am: 54e26747b0 Change-Id: I07032d2a059c39fe1c3c02234b809d1ac2da55e4
2018-09-18Merge "Convert jdiff to Soong" am: 9335763d33Nan Zhang
am: fa10df3198 Change-Id: I07daa5c89c6a3a95ceafddf0e21fbc5b97bc0808
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 20:16:04 +0000