OSDN Git Service

am ca0d88b8: am c3adcf9d: Merge "replace instances of Wi-Fi Direct with Wi-Fi P2P...
authorScott Main <smain@google.com>
Wed, 4 Sep 2013 16:20:31 +0000 (09:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Sep 2013 16:20:31 +0000 (09:20 -0700)
commitc6ed9ff77a6ce1ed05397a4abdea8ebb8a290b42
treea5c1a7593e9cdc8e9c2dc995a7c4ea54eec661f0
parentf579f134ee9495571899be958983a1a242457603
parentca0d88b841db52fc926027f412003a8bf6efdf39
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