OSDN Git Service

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

Change-Id: Ic0f00c2987b47915300596569b0fcffaf20dcb08


Trivial merge