OSDN Git Service

Merge "[NAN] Security configuration (cipher)"
authorEtan Cohen <etancohen@google.com>
Tue, 21 Feb 2017 16:27:49 +0000 (16:27 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 21 Feb 2017 16:27:50 +0000 (16:27 +0000)

Trivial merge