diff options
| author | James Kelly <jfkelly@google.com> | 2013-09-18 18:07:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-18 18:07:02 -0700 |
| commit | 1f8cf09c53c72d26ca67974d1b7e51112be4a170 (patch) | |
| tree | 7579459435ce2eac8dacd9167530b47e50bd3915 /docs/html/guide | |
| parent | a621cfe84fcdab3b4e956148203be66e158316da (diff) | |
| parent | 2815bb05a042975b282f7131514368aa89cf0dd4 (diff) | |
| download | frameworks_base-1f8cf09c53c72d26ca67974d1b7e51112be4a170.zip frameworks_base-1f8cf09c53c72d26ca67974d1b7e51112be4a170.tar.gz frameworks_base-1f8cf09c53c72d26ca67974d1b7e51112be4a170.tar.bz2 | |
am 2815bb05: am 48c6b573: Merge "more string changes for wi-fi trademark compliance" into jb-mr2-docs
* commit '2815bb05a042975b282f7131514368aa89cf0dd4':
more string changes for wi-fi trademark compliance
Diffstat (limited to 'docs/html/guide')
| -rw-r--r-- | docs/html/guide/topics/connectivity/index.jd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/guide/topics/connectivity/index.jd b/docs/html/guide/topics/connectivity/index.jd index 322518e..385cf08 100644 --- a/docs/html/guide/topics/connectivity/index.jd +++ b/docs/html/guide/topics/connectivity/index.jd @@ -1,6 +1,6 @@ page.title=Connectivity page.landing=true -page.landing.intro=Android provides rich APIs to let your app connect and interact with other devices over Bluetooth, NFC, Wi-Fi Direct, USB, and SIP, in addition to standard network connections. +page.landing.intro=Android provides rich APIs to let your app connect and interact with other devices over Bluetooth, NFC, Wi-Fi P2P, USB, and SIP, in addition to standard network connections. page.landing.image=images/develop/connectivity.png @jd:body |