Commits
Scott Main authored and Android Git Automerger committed c6ed9ff77a6M
am ca0d88b8: am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs * commit 'ca0d88b841db52fc926027f412003a8bf6efdf39': replace instances of Wi-Fi Direct with Wi-Fi P2P
Showing diff tof579f134ee9