tree 510211ad5600141a8274e8b6d9af61b48a0c4296
parent 704dfc6c1df4fe736b6dd892ead5cecc863c03a2
parent 393ead3e4a22c473a4d316e47f9bbda36f638188
author Treehugger Robot <treehugger-gerrit@google.com> 1614028265 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614028265 +0000

Merge "_PATH_SSH_PROGRAM should point to ssh not sftp" am: 68ca7e1315 am: 1eafa1de31 am: 4c22b0272b am: 393ead3e4a

Original change: https://android-review.googlesource.com/c/platform/external/openssh/+/213336

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8256ff9d183fcf0884f51549170e1eeaf5994a5e