aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-02-22Merge "_PATH_SSH_PROGRAM should point to ssh not sftp" am: 68ca7e1315 am: 1ea...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-1Treehugger Robot
2021-02-22Merge "_PATH_SSH_PROGRAM should point to ssh not sftp" am: 68ca7e1315 am: 1ea...Treehugger Robot
2021-02-22Merge "_PATH_SSH_PROGRAM should point to ssh not sftp" am: 68ca7e1315android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Treehugger Robot
2021-02-22Merge "_PATH_SSH_PROGRAM should point to ssh not sftp"Treehugger Robot
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: bd52a897ef -s ou...Xin Li
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: bd52a897ef -s oursXin Li
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/openssh" am: bd23aeed4f am: ...Bob Badour
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/openssh" am: bd23aeed4f am: ...Bob Badour
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/openssh" am: bd23aeed4fBob Badour
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/openssh"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/opensshBob Badour
2021-01-19_PATH_SSH_PROGRAM should point to ssh not sftpAndy Pilate
2020-11-24Mark ab/6881855 as merged am: 3f00f0910d am: a045d70d67Xin Li
2020-11-24Mark ab/6881855 as merged am: 3f00f0910dXin Li
2020-11-23Mark ab/6881855 as mergedXin Li
2020-10-09Merge "Update OpenSSH build config for current BoringSSL." am: 2088011c5f am:...Pete Bentley
2020-10-09Merge "Update OpenSSH build config for current BoringSSL." am: 2088011c5f am:...Pete Bentley
2020-10-09Merge "Update OpenSSH build config for current BoringSSL." am: 2088011c5f am:...Pete Bentley
2020-10-09Merge "Update OpenSSH build config for current BoringSSL." am: 2088011c5fPete Bentley
2020-10-09Merge "Update OpenSSH build config for current BoringSSL."Pete Bentley
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 2b01ca0366 -s ours am: 7fb...Xin Li
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 2b01ca0366 -s ours am: 7fb...Xin Li
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 2b01ca0366 -s oursXin Li
2020-10-08Skip ab/6749736 in stage.Xin Li
2020-10-06Update OpenSSH build config for current BoringSSL.Pete Bentley
2020-10-03[automerger skipped] Merge remote-tracking branch 'goog/mirror-aosp-master' i...Alistair Delva
2020-10-02Merge remote-tracking branch 'goog/mirror-aosp-master' into HEAD am: fe1fdfc6...Alistair Delva
2020-10-02Merge remote-tracking branch 'goog/mirror-aosp-master' into HEAD am: fe1fdfc6...Alistair Delva
2020-10-02Merge remote-tracking branch 'goog/mirror-aosp-master' into HEAD am: fe1fdfc64aAlistair Delva
2020-10-01Merge remote-tracking branch 'goog/stage-aosp-master' into masterAlistair Delva
2020-09-30Merge remote-tracking branch 'goog/mirror-aosp-master' into HEADAlistair Delva
2020-09-30[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (56...Xin Li
2020-09-30Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: dc113ced71 a...Xin Li
2020-09-30DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aos...Xin Li
2020-09-30Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: dc113ced71 a...Xin Li
2020-09-29DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aos...Xin Li
2020-09-29Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: dc113ced71 a...Xin Li
2020-09-29DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aos...Xin Li
2020-09-29Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: dc113ced71Xin Li
2020-09-29Merge "ANDROID: Remove bogus HAVE_ARC4RANDOM_STIR"platform-tools-30.0.5Alistair Delva
2020-09-28ANDROID: Remove bogus HAVE_ARC4RANDOM_STIRAlistair Delva
2020-08-21Merge changes I934c73d4,I28cdc9a0,I9e734da9,I3c079d86Alistair Delva
2020-08-20UPSTREAM: dependDamien Miller
2020-08-20UPSTREAM: upstream: avoid possible NULL deref; from Pedro Martellettodjm@openbsd.org
2020-08-20Revert "upstream: fix compilation with DEBUG_KEXDH; bz#3160 ok dtucker@"Alistair Delva
2020-08-20Merge upstream-master into masterAlistair Delva
2020-08-12Merge "Pass control to adelva@"Treehugger Robot
2020-08-12Pass control to adelva@Greg Hartman
2020-05-27upstream: fix compilation with DEBUG_KEXDH; bz#3160 ok dtucker@djm@openbsd.org