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)
commit1aa8b4f33078b8011a7faaa9872c1809240d9119
tree966a9f88a665d3fbe435c72f01321ba50b205394
parent20107d1fc940ae8aae3f20a47cdbafef5bdb1289
parentf24303c6ec3d064c794ccf3524c43a2cd42724c3
Merge "[NAN] Security configuration (cipher)" am: 0f9dc48b2c
am: f24303c6ec

Change-Id: Ic0f00c2987b47915300596569b0fcffaf20dcb08