| commit | ca0d88b841db52fc926027f412003a8bf6efdf39 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Wed Sep 04 09:18:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 04 09:18:23 2013 -0700 |
| tree | 66b5a8cb7ca632fbf90ef15cc4d6de6b75acae68 | |
| parent | e0718c044bc81db0334f2973b9884b968c18ce07 [diff] | |
| parent | c3adcf9dc745932bf3a059a7201644dd96b97750 [diff] |
am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2-docs * commit 'c3adcf9dc745932bf3a059a7201644dd96b97750': replace instances of Wi-Fi Direct with Wi-Fi P2P