tree 8ba46cab3af97c64a228b94113614bbd0aa6eef1
parent eec42c347ff6953754b85e2e6ef38a8f99fe9915
parent f511bd78dbb59aaec740079f05cf29c24a66f3dc
author Etan Cohen <etancohen@google.com> 1505163752 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1505163752 +0000

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