OSDN Git Service

Merge "[NAN] Rename setTerminateNotificationEnabled per API review" am: 5d74bf9f95
authorEtan Cohen <etancohen@google.com>
Tue, 27 Sep 2016 20:06:56 +0000 (20:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Sep 2016 20:06:56 +0000 (20:06 +0000)
commitfb43e8509bae2a7ce9b439382665d19c919df674
tree83f8080805b3c7bb8581b61728575b80e41c060b
parentc415e8c577f09f3c41ad53d52628b1c216952e32
parent62be010f2a06f41ca19106cff069ea6e9c06d2b0
Merge "[NAN] Rename setTerminateNotificationEnabled per API review" am: 5d74bf9f95
am: 62be010f2a

Change-Id: I9354e65db8144c01bfbe748f3661f633d5a06c70