OSDN Git Service

Merge "[NAN] Security configuration (cipher)"
authorEtan Cohen <etancohen@google.com>
Tue, 21 Feb 2017 17:56:44 +0000 (17:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Feb 2017 17:56:44 +0000 (17:56 +0000)
am: 0f9dc48b2c

Change-Id: Id7ad1e6adee225bbc885ca23a973a04512858016


Trivial merge