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