From: Etan Cohen Date: Tue, 21 Feb 2017 18:00:40 +0000 (+0000) Subject: Merge "[NAN] Security configuration (cipher)" am: 0f9dc48b2c am: f24303c6ec X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3a9a7169a8244784a3f536e528614b567c68023f;p=android-x86%2Fhardware-libhardware_legacy.git Merge "[NAN] Security configuration (cipher)" am: 0f9dc48b2c am: f24303c6ec am: 1aa8b4f330 Change-Id: Ic0335cc3e2c9833c83cd3d1497fa3f03a5502b52 --- 3a9a7169a8244784a3f536e528614b567c68023f