OSDN Git Service

Merge "[NAN] Security configuration (cipher)" am: 0f9dc48b2c am: f24303c6ec
authorEtan Cohen <etancohen@google.com>
Tue, 21 Feb 2017 18:00:40 +0000 (18:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Feb 2017 18:00:40 +0000 (18:00 +0000)
commit3a9a7169a8244784a3f536e528614b567c68023f
treea57a4222fd103599adede9920f1a3c78280cb658
parenta1f2ef4d6f6c78a1b4bcc6e4825c311d5ff1febd
parent1aa8b4f33078b8011a7faaa9872c1809240d9119
Merge "[NAN] Security configuration (cipher)" am: 0f9dc48b2c am: f24303c6ec
am: 1aa8b4f330

Change-Id: Ic0335cc3e2c9833c83cd3d1497fa3f03a5502b52