OSDN Git Service

Merge "[NAN] Re-factor connect/config flow" into mm-wireless-dev
authorEtan Cohen <etancohen@google.com>
Fri, 8 Apr 2016 15:00:12 +0000 (15:00 +0000)
committerAndroid Partner Code Review <android-gerrit-partner@google.com>
Fri, 8 Apr 2016 15:00:12 +0000 (15:00 +0000)

Trivial merge