commit 5256cea578c2d02fcef8161e0f0d2eb348d60723
author Etan Cohen <etancohen@google.com> Tue Aug 15 16:50:19 2017 -0700
committer Etan Cohen <etancohen@google.com> Tue Aug 15 16:50:37 2017 -0700
tree 976ce4becd9d3a7147e98803105d156e49c67c3b
parent 67a00d40bc7189b45683f1310569d804d784e690
parent 3718363c50cefeddb1234ba9e9c6bf2bdbfd9c09

resolve merge conflicts of 3718363c to master

Test: builds
Change-Id: I9e3bcca3e22c0787ca621b6229cbcfd750220698

current.txt

diff --git a/current.txt b/current.txt
index 78839be..2546a56 100644
--- a/current.txt
+++ b/current.txt
@@ -196,6 +196,7 @@
 6e69adb24d7c0b0ca3a54a38c49a5625b161b3f5d5f7d6fda0befdbbfc8e9e06 android.hardware.radio@1.0::IRadioResponse
 28e929b453df3d9f5060af2764e6cdb123ddb893e3e86923c877f6ff7e5f02c9 android.hardware.wifi@1.0::types
 bfd81bcafa3c97519cd56ad29e9fa48e23d1d323b89dbcc85899282a8c628194 android.hardware.automotive.vehicle@2.0::types
+df1d7b27e644bfed0a4f606a8c44d35d45cafce82c7c648494c8a25c7cd4a949 android.hardware.wifi@1.0::types
 
 # HALs released in Android O MR1
 

wifi/1.0/types.hal

diff --git a/wifi/1.0/types.hal b/wifi/1.0/types.hal
index 1b5f8f7..b9fb0bd 100644
--- a/wifi/1.0/types.hal
+++ b/wifi/1.0/types.hal
@@ -1355,8 +1355,8 @@
    */
   uint32_t maxNdiInterfaces;
   /**
-   * Maximum number of data paths (NDP) which can be created concurrently on each individual
-   * data interface (NDI).
+   * Maximum number of data paths (NDP) which can be created concurrently on the device, across all
+   * data interfaces (NDI).
    */
   uint32_t maxNdpSessions;
   /**