Skip to content
Commit 95fad688 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: ee1e81ec am: c5101c52 

am: 97b3d995

Change-Id: Ie9eeeb5b5a898a8b147628d8aacf1e365fa6e91a
parents 4d855f15 97b3d995
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