OSDN Git Service

Merge "[NAN] Rename to make discovery explicit"
authorEtan Cohen <etancohen@google.com>
Tue, 20 Sep 2016 16:50:01 +0000 (16:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Sep 2016 16:50:01 +0000 (16:50 +0000)
am: 5706a8f535

Change-Id: Ic71e0eced353dfdfb989876ddb4c11f4188625c5


Trivial merge