tree 1beb8306073c254f772d12c7e163443d585c99ac
parent 96acba08b19574b9d3cea0834246b9dc9e4684e5
parent bad0137ff3af9bb082382e57f0e2a4b5fbda6dbd
author Etan Cohen <etancohen@google.com> 1505165058 +0000
committer android-build-merger <android-build-merger@google.com> 1505165058 +0000

Merge "[AWARE] Support multiple NAN data interfaces (NDI)" into oc-mr1-dev
am: bad0137ff3

Change-Id: I8dc0e337b858f5d05d696d13dc3bc10a7ea93b45