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)
commiteb4c838c469fc63e54ee4768bd90b7051f771c97
tree228f2aae13f8087f8e96b754cb8a3d7c87979a00
parentc507bcaf6345015660abb5c05207f8c9d96e6738
parent5706a8f5353218a60d3cf104a03e79fae301c27d
Merge "[NAN] Rename to make discovery explicit"
am: 5706a8f535

Change-Id: Ic71e0eced353dfdfb989876ddb4c11f4188625c5