Skip to content
Commit e3d5fa10 authored by Etan Cohen's avatar Etan Cohen Committed by Gerrit Code Review
Browse files

Merge changes from topic 'cherry-pick' 

* changes:
  [NAN] Register WIFI_NAN_STATE_CHANGED as protected broadcast
  [NAN] Update API javadoc to clarify NAN status change broadcast scope
parents 42d25b59 720d1757
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment