| commit | e540b64aaf58460f7930a5e4937cee660215c948 | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Fri Jan 15 01:17:08 2016 +0000 |
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | Fri Jan 15 01:17:08 2016 +0000 |
| tree | 3d5104ec0a5eb5a14329d7c1541102d913940dd8 | |
| parent | 49442a1dd7bbf15e6014e88d8143f198a43bad05 [diff] | |
| parent | 20d329b08df7d1a94e6caee781f09e812a79c913 [diff] |
Merge "NAN: baseline NAN manager for discovery." into mm-wireless-dev