summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Ly <robertly@google.com>2011-05-04 17:04:50 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-04 17:04:50 -0700
commitd1e58d5d02f80e2fa3e98d70280023a5c6c6467a (patch)
treea3b4753cffe9a3cf60624b63fdc31b78e3684e04
parenta9faac5554bd8ad4f9e81e719288c9900d708c52 (diff)
parent796ba68b73fa93ae290cf85b264183ffcfa45eba (diff)
downloadframeworks_base-d1e58d5d02f80e2fa3e98d70280023a5c6c6467a.zip
frameworks_base-d1e58d5d02f80e2fa3e98d70280023a5c6c6467a.tar.gz
frameworks_base-d1e58d5d02f80e2fa3e98d70280023a5c6c6467a.tar.bz2
am 796ba68b: am 2246bc66: am 7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1
* commit '796ba68b73fa93ae290cf85b264183ffcfa45eba': doc change: a misplaced link removed
-rw-r--r--docs/html/guide/topics/usb/accessory.jd6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/guide/topics/usb/accessory.jd b/docs/html/guide/topics/usb/accessory.jd
index 7638e30..b0f4881 100644
--- a/docs/html/guide/topics/usb/accessory.jd
+++ b/docs/html/guide/topics/usb/accessory.jd
@@ -50,9 +50,9 @@ page.title=USB Accessory
</div>
</div>
- <p><a href="http://accessories.android.com/demokit">USB accessory mode allows users to connect
+ <p>USB accessory mode allows users to connect
USB host hardware specifically designed for Android-powered devices. The accessories must adhere
- to the Android accessory protocol outlined in</a> <a href=
+ to the Android accessory protocol outlined in the <a href=
"http://accessories.android.com/demokit">Android Accessory Development Kit</a> documentation.
This allows Android-powered devices that cannot act as a USB host to still interact with USB
hardware. When an Android-powered device is in USB accessory mode, the attached Android USB
@@ -445,7 +445,7 @@ BroadcastReceiver mUsbReceiver = new BroadcastReceiver() {
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
- if (UsbManager.ACTION_USB_ACCESSORY_DETACHED.equals(action)) {
+ if (UsbManager.ACTION_USB_ACCESSORY_DETACHED.equals(action)) {
UsbAccessory accessory = (UsbAccessory)intent.getParcelableExtra(UsbManager.EXTRA_ACCESSORY);
if (accessory != null) {
// call your method that cleans up and closes communication with the accessory