diff options
| author | Scott Main <smain@google.com> | 2011-06-28 20:25:43 -0700 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2011-06-28 20:45:32 -0700 |
| commit | a687045045157eab2dbf657bb085cb0af68d72f2 (patch) | |
| tree | 7716363d7ea30264fd213f6ce5c62949993d8a6a /docs | |
| parent | 5db9ff97aa8f36f330f41f5ae42467795ef075b8 (diff) | |
| download | frameworks_base-a687045045157eab2dbf657bb085cb0af68d72f2.zip frameworks_base-a687045045157eab2dbf657bb085cb0af68d72f2.tar.gz frameworks_base-a687045045157eab2dbf657bb085cb0af68d72f2.tar.bz2 | |
cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e
docs: fix game controller trademarks
Change-Id: I1eca030bad5bae0c581000fefffd5d3d49aac205
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/sdk/android-3.1-highlights.jd | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/sdk/android-3.1-highlights.jd b/docs/html/sdk/android-3.1-highlights.jd index 3d132a3..88bc1ee 100644 --- a/docs/html/sdk/android-3.1-highlights.jd +++ b/docs/html/sdk/android-3.1-highlights.jd @@ -143,8 +143,8 @@ point, select, drag, scroll, hover, and other standard actions.</p> <p>To make the platform even better for gaming, Android 3.1 adds support for most PC joysticks and gamepads that are connected over USB or Bluetooth HID.</p> -<p>For example, users can connect Sony Playstation™ 3 and XBox 360™ game -controllers over USB (but not Bluetooth), Logitech Dual Action™ gamepads and +<p>For example, users can connect PlayStation<sup>®</sup>3 and Xbox 360<sup>®</sup> +game controllers over USB (but not Bluetooth), Logitech Dual Action™ gamepads and flight sticks, or a car racing controller. Game controllers that use proprietary networking or pairing are not supported by default, but in general, the platform supports most PC-connectible joysticks and gamepads.</p> |