| commit | 3da7357951a1981ecf40391e19ad8e53b45cb046 | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Fri Jan 15 01:29:48 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 15 01:29:48 2016 +0000 |
| tree | cfc394e8b0a0137a3a7203827c7248c718a7cb3c | |
| parent | f1fc5a0fe802f8cbf477b1ef54b25127818e091d [diff] | |
| parent | e540b64aaf58460f7930a5e4937cee660215c948 [diff] |
Merge "NAN: baseline NAN manager for discovery." into mm-wireless-dev am: e540b64aaf * commit 'e540b64aaf58460f7930a5e4937cee660215c948': NAN: baseline NAN manager for discovery.