Commits


Robert Greenwalt authored and Android Git Automerger committed d76a6851a89M
am 6f2b31fc: am 56a7e4ad: am 116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev * commit '6f2b31fcf57e4e7f5cd8af9b66619c8f5825a850': Block Wifi P2p discovery while doing dhcp.
Showing diff to6f2b31fcf57