Skip to content
Commit 6f2b31fc authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am 56a7e4ad: am 116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev 

* commit '56a7e4ad':
  Block Wifi P2p discovery while doing dhcp.
parents 330cf2f7 56a7e4ad
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