OSDN Git Service

Merge "openssh-7.1p2"
authorGreg Hartman <ghartman@google.com>
Thu, 11 Feb 2016 00:57:42 +0000 (00:57 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 11 Feb 2016 00:57:42 +0000 (00:57 +0000)

Trivial merge