OSDN Git Service

am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P" into jb-mr2...
authorScott Main <smain@google.com>
Wed, 4 Sep 2013 16:18:23 +0000 (09:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Sep 2013 16:18:23 +0000 (09:18 -0700)
commitca0d88b841db52fc926027f412003a8bf6efdf39
tree66b5a8cb7ca632fbf90ef15cc4d6de6b75acae68
parente0718c044bc81db0334f2973b9884b968c18ce07
parentc3adcf9dc745932bf3a059a7201644dd96b97750
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