tree eeb756279c808b859d521dda9b957aeb514711a5
parent fe6f369b36757041e8da958f32248aac671642f2
parent 9424e9d541f6bb0a8f98b83b96fd30e21dea6e71
author Etan Cohen <etancohen@google.com> 1497572178 +0000
committer android-build-merger <android-build-merger@google.com> 1497572178 +0000

Merge "[AWARE] Actually shut-down functionality when destroying NAN iface" into oc-dr1-dev
am: 9424e9d541

Change-Id: Ia6990c90e8ffc17f2a88815d0cd53ac7dbffba31