From: Etan Cohen <etancohen@google.com>
Date: Tue, 21 Feb 2017 17:59:03 +0000 (+0000)
Subject: Merge "[NAN] Security configuration (cipher)" am: 0f9dc48b2c
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1aa8b4f33078b8011a7faaa9872c1809240d9119;p=android-x86%2Fhardware-libhardware_legacy.git

Merge "[NAN] Security configuration (cipher)" am: 0f9dc48b2c
am: f24303c6ec

Change-Id: Ic0f00c2987b47915300596569b0fcffaf20dcb08
---

1aa8b4f33078b8011a7faaa9872c1809240d9119