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)
commitf24303c6ec3d064c794ccf3524c43a2cd42724c3
tree966a9f88a665d3fbe435c72f01321ba50b205394
parentfa192e08ebc99cd314716842faff81f704b5324b
parent0f9dc48b2c0f6199fbd0eb3331a30a8d1b84d41e
Merge "[NAN] Security configuration (cipher)"
am: 0f9dc48b2c

Change-Id: Id7ad1e6adee225bbc885ca23a973a04512858016