OSDN Git Service

Merge "[NAN] Rename setTerminateNotificationEnabled per API review"
authorEtan Cohen <etancohen@google.com>
Tue, 27 Sep 2016 20:02:00 +0000 (20:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Sep 2016 20:02:00 +0000 (20:02 +0000)
am: 5d74bf9f95

Change-Id: I435c5377d7897cee20bba7a352eb55e85e996673


Trivial merge