OSDN Git Service

Merge "[NAN] Change Broadcast for NAN status change to notification only" am: e1513a8cc6
authorEtan Cohen <etancohen@google.com>
Mon, 26 Sep 2016 16:53:04 +0000 (16:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 26 Sep 2016 16:53:04 +0000 (16:53 +0000)
am: f95a3703c1

Change-Id: Ic271ac809add1ac66b468ee337f2838e2a008cdc


Trivial merge