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