tree 3d5104ec0a5eb5a14329d7c1541102d913940dd8
parent 49442a1dd7bbf15e6014e88d8143f198a43bad05
parent 20d329b08df7d1a94e6caee781f09e812a79c913
author Etan Cohen <etancohen@google.com> 1452820628 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> 1452820628 +0000

Merge "NAN: baseline NAN manager for discovery." into mm-wireless-dev