aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
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
2020-04-28Merge "Add METADATA to jdiff: LGPL+GPL=RESTRICTED" am: a62cf319f0 am: 1508d2b...Treehugger Robot
2020-04-28Merge "Add METADATA to jdiff: LGPL+GPL=RESTRICTED" am: a62cf319f0 am: 1508d2b...Treehugger Robot
2020-04-28Merge "Add METADATA to jdiff: LGPL+GPL=RESTRICTED" am: a62cf319f0 am: 1508d2b9c7Treehugger Robot
2020-04-28Merge "Add METADATA to jdiff: LGPL+GPL=RESTRICTED" am: a62cf319f0Treehugger Robot
2020-04-28Merge "Add METADATA to jdiff: LGPL+GPL=RESTRICTED"Treehugger Robot
2020-04-28Add METADATA to jdiff: LGPL+GPL=RESTRICTEDBob Badour
2019-10-30[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...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
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...Xin Li
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
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
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (56...Xin Li
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aos...Xin Li
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aos...temp_140451723Xin Li
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
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
2019-02-13Merge "Ignore Gradle temp files in jdiff" am: 0be98884b3 am: b0dfb93378Chris Banes
2019-02-13Merge "Ignore Gradle temp files in jdiff" am: 0be98884b3Chris Banes
2019-02-13Merge "Ignore Gradle temp files in jdiff"Chris Banes
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
2019-01-11Merge "Add default code reviewers into OWNERS" am: d6366071de am: 7686be8cafChih-hung Hsieh
2019-01-11Merge "Add default code reviewers into OWNERS" am: d6366071deChih-hung Hsieh
2019-01-11Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
2019-01-11Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
2019-01-10Add default code reviewers into OWNERSChih-Hung Hsieh
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE...Bill Yi
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE...Bill Yi
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ...Bill Yi
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ...Bill Yi
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
2018-09-18Merge "Convert jdiff to Soong" am: 9335763d33 am: fa10df3198Nan Zhang
2018-09-18Merge "Convert jdiff to Soong" am: 9335763d33Nan Zhang
2018-09-18Merge "Convert jdiff to Soong"Nan Zhang
2018-09-19Merge "Convert jdiff to Soong"master-cuttlefish-testing-releaseandroidx-paging-releaseTreehugger Robot
2018-09-17Convert jdiff to SoongNan Zhang
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 15:07:06 +0000