Skip to content
Commit 116d4665 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev

parents 57b0fed7 6433ef29
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