summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2022-04-13Merge "Jeff moved to a different team so remove him from OWNERS" am: 1bfa1160...t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010main-16kandroid13-frc-odp-releaseandroid13-devTreehugger Robot
2022-04-12Merge "Jeff moved to a different team so remove him from OWNERS" am: 1bfa1160...Treehugger Robot
2022-04-12Merge "Jeff moved to a different team so remove him from OWNERS" am: 1bfa1160b6Treehugger Robot
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
2021-06-02Merge sc-mainline-prodXin Li
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/neven" am: 2bb04a6b84 am: 33...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-releaseTreehugger Robot
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/neven" am: 2bb04a6b84 am: 33...Treehugger Robot
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/neven" am: 2bb04a6b84 am: 33...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-1Treehugger Robot
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/neven" am: 2bb04a6b84 am: 33...Treehugger Robot
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/neven" am: 2bb04a6b84android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Treehugger Robot
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/neven"android-s-preview-1Treehugger Robot
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/nevenBob Badour
2020-04-29Merge "Add METADATA to neven: Apache2=NOTICE" am: 9444bc7e3b am: 9fbdbb4e33 a...Treehugger Robot
2020-04-29Merge "Add METADATA to neven: Apache2=NOTICE" am: 9444bc7e3b am: 9fbdbb4e33 a...Treehugger Robot
2020-04-29Merge "Add METADATA to neven: Apache2=NOTICE" am: 9444bc7e3b am: 9fbdbb4e33 a...Treehugger Robot
2020-04-29Merge "Add METADATA to neven: Apache2=NOTICE" am: 9444bc7e3b am: 9fbdbb4e33Treehugger Robot
2020-04-29Merge "Add METADATA to neven: Apache2=NOTICE" am: 9444bc7e3bandroid-r-beta-3android-r-beta-2Treehugger Robot
2020-04-29Merge "Add METADATA to neven: Apache2=NOTICE"Treehugger Robot
2020-04-28Add METADATA to neven: Apache2=NOTICEBob Badour
2020-04-14Merge "Add explicit dependencies on jni_headers" am: 264cbeebc9 am: c535cf725...Orion Hodson
2020-04-14Merge "Add explicit dependencies on jni_headers" am: 264cbeebc9 am: c535cf725...Orion Hodson
2020-04-14Merge "Add explicit dependencies on jni_headers" am: 264cbeebc9 am: c535cf725...Orion Hodson
2020-04-14Merge "Add explicit dependencies on jni_headers" am: 264cbeebc9 am: c535cf7258Orion Hodson
2020-04-14Merge "Add explicit dependencies on jni_headers" am: 264cbeebc9Orion Hodson
2020-04-14Merge "Add explicit dependencies on jni_headers"Orion Hodson
2020-04-03Add explicit dependencies on jni_headersOrion Hodson
2019-05-10Merge "Convert external/neven/Android.mk file to Android.bp file" am: b71d4e6...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
2019-05-10Merge "Convert external/neven/Android.mk file to Android.bp file" am: b71d4e6acfandroid-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-10.0.0_r8android-mainline-10.0.0_r6ndk-sysroot-r21android10-mainline-resolv-releaseandroid10-mainline-networking-releasePatrice Arruda
2019-05-10Merge "Convert external/neven/Android.mk file to Android.bp file"android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Patrice Arruda
2019-05-10Merge "Convert external/neven/Android.mk file to Android.bp file"Treehugger Robot
2019-05-10Convert external/neven/Android.mk file to Android.bp filePatrice Arruda
2019-03-19Merge "Fix LOCAL_MODULE_CLASS." am: 7467a54e29 am: d92d484537android-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-releaseJaewoong Jung
2019-03-19Merge "Fix LOCAL_MODULE_CLASS." am: 7467a54e29Jaewoong Jung
2019-03-19Merge "Fix LOCAL_MODULE_CLASS."Jaewoong Jung
2019-03-19Merge "Fix LOCAL_MODULE_CLASS."android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseJaewoong Jung
2019-03-18Fix LOCAL_MODULE_CLASS.Jaewoong Jung
2019-03-11[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"...Xin Li
2019-03-11[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"...Xin Li
2019-03-11[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: b06...Xin Li
2019-03-11[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"Xin Li
2019-03-11[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: b06...Xin Li
2019-03-11[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into masterXin Li
2019-03-11Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"android-q-preview-1android-o-mr1-iot-release-1.0.10Treehugger Robot
2019-03-11DO NOT MERGE - Merge PPRL.190305.001 into masterXin Li
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin 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-11[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.00...Xin Li
2019-02-11[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.00...Xin Li