diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-22 20:00:03 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-22 20:00:03 +0000 |
commit | 393ead3e4a22c473a4d316e47f9bbda36f638188 (patch) | |
tree | 510211ad5600141a8274e8b6d9af61b48a0c4296 /openbsd-compat/regress/utimensattest.c | |
parent | 25ef2dec746d097a26198aa01533ad3cd23ebed5 (diff) | |
parent | 4c22b0272bbcab9f9a51ae9857d5b05c802af63b (diff) | |
download | openssh-393ead3e4a22c473a4d316e47f9bbda36f638188.tar.gz |
Merge "_PATH_SSH_PROGRAM should point to ssh not sftp" am: 68ca7e1315 am: 1eafa1de31 am: 4c22b0272bandroid-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-1
Original change: https://android-review.googlesource.com/c/platform/external/openssh/+/213336
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id6f592a0b4d99010c4bbfa4b13bde99a772aa5c0
Diffstat (limited to 'openbsd-compat/regress/utimensattest.c')
0 files changed, 0 insertions, 0 deletions