tree 4df4cb4549ae1947b848c38f6b66e0b2b56853c7
parent 275f6bc8abff305325d1a052646b057248ae169d
parent fe985955c25537c95594d70574cfaf59eb1a3cfd
author Etan Cohen <etancohen@google.com> 1475007503 +0000
committer android-build-merger <android-build-merger@google.com> 1475007503 +0000

Merge "[NAN] Rename setTerminateNotificationEnabled per API review" am: 5d74bf9f95 am: 62be010f2a am: fb43e8509b
am: fe985955c2

Change-Id: I984bec4b050f93486030a2e7c6320b53d990f776