Skip to content
Commit 9c954fe2 authored by Etan Cohen's avatar Etan Cohen Committed by android-build-merger
Browse files

Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery" am:... 

Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery" am: ee1e81ec am: c5101c52 am: 97b3d995
am: 95fad688

Change-Id: I07444f201db7c5629413f9e96a2837c1d24a8b11
parents eb0388fc 95fad688
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