commit | bad0137ff3af9bb082382e57f0e2a4b5fbda6dbd | [log] [tgz] |
---|---|---|
author | Etan Cohen <etancohen@google.com> | Mon Sep 11 21:02:32 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Sep 11 21:02:32 2017 +0000 |
tree | e782c053a166814aa868f291471e51ea1aa2dbfe | |
parent | f0653448fc27d0f73d58a3abf948ef38609331e4 [diff] | |
parent | a25953fc4fd640cebf57f1e33490a507af3c1db5 [diff] |
Merge "[AWARE] Support multiple NAN data interfaces (NDI)" into oc-mr1-dev