Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 17cddaf2: am 409b9a4c: Merge "Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"" into honeycomb-mr2

Browse Source 
* commit '17cddaf2a64c8392a8e852283e720d3abdaca9b3':
  Revert "cherrypick from hc mr1 Change-Id: I23143ecaa0eeab68d55d007b8594a51bf90fbab7"
This commit is contained in:
Robert Ly
2011-06-14 16:41:52 -07:00
committed by Android Git Automerger
parent 2aeafe0baa 17cddaf2a6
commit f3c9a2517a
1 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
docs/html/guide/topics/usb/adk.jd
View File

@@ -56,6 +56,8 @@ page.title=Android Open Accessory Development Kit
</li> </li>
</ol> </ol>
<h2>See also</h2> <h2>See also</h2>
<ol> <ol>
@@ -66,12 +68,6 @@ page.title=Android Open Accessory Development Kit
<h2>Where to buy</h2> <h2>Where to buy</h2>
<ol> <ol>
<li><a href="http://shop.moderndevice.com/products/freeduino-usb-host-board">
Modern Device</a></li>
<li><a href="http://www.seeedstudio.com/depot/seeeduino-adk-main-board-p-846.html">
Seeed Studio</a></li>
<li><a href= <li><a href=
"http://www.rt-net.jp/shop/index.php?main_page=product_info&cPath=3_4&products_id=1"> "http://www.rt-net.jp/shop/index.php?main_page=product_info&cPath=3_4&products_id=1">
RT Corp</a></li> RT Corp</a></li>
@@ -82,7 +78,6 @@ page.title=Android Open Accessory Development Kit
<li><a href="https://store.diydrones.com/ProductDetails.asp?ProductCode=BR-PhoneDrone"> <li><a href="https://store.diydrones.com/ProductDetails.asp?ProductCode=BR-PhoneDrone">
DIY Drones</a></li> DIY Drones</a></li>
</ol> </ol>
</div> </div>
</div> </div>
@@ -110,25 +105,13 @@ page.title=Android Open Accessory Development Kit
development boards:</p> development boards:</p>
<ul> <ul>
<li><a href="http://shop.moderndevice.com/products/freeduino-usb-host-board">Modern
Device</a> provides an Arduino-compatible board that supports the ADK firmware.</li>
<li><a href="http://www.seeedstudio.com/depot/seeeduino-adk-main-board-p-846.html">
Seeed Studio</a> provides an Arduino-compatible board that supports the ADK firmware.</li>
<li><a href="http://www.rt-net.jp/shop/index.php?main_page=product_info&cPath=3_4&products_id=1"> <li><a href="http://www.rt-net.jp/shop/index.php?main_page=product_info&cPath=3_4&products_id=1">
RT Corp</a> provides an Arduino-compatible board based on the Android ADK board design.</li> RT Corp</a> provides an Arduino-compatible board based on the Android ADK board design.</li>
<li><a href="http://www.microchip.com/android">Microchip</a> provides a A PIC based USB <li><a href="http://www.microchip.com/android">Microchip</a> provides a A PIC based USB
microcontroller board.</li> microcontroller board.</li>
<li><a href="https://store.diydrones.com/ProductDetails.asp?ProductCode=BR-PhoneDrone">DIY <li><a href="https://store.diydrones.com/ProductDetails.asp?ProductCode=BR-PhoneDrone">DIY
Drones</a> provides an Arduino-compatible board geared towards RC (radio controlled) and UAV Drones</a> provides an Arduino-compatible board geared towards RC (radio controlled) and UAV
(unmanned aerial vehicle) enthusiasts.</li> (unmanned aerial vehicle) enthusiasts.</li>
<<<<<<< HEAD
=======
>>>>>>> c38ed22... doc change: add link to seeedstudio board
</ul> </ul>
<p>We expect more hardware distributers to create a variety of kits, so please stay tuned for <p>We expect more hardware distributers to create a variety of kits, so please stay tuned for
@@ -139,7 +122,7 @@ page.title=Android Open Accessory Development Kit
accessory that is based on the <a href="http://www.arduino.cc/">Arduino open source electronics accessory that is based on the <a href="http://www.arduino.cc/">Arduino open source electronics
prototyping platform</a>, the accessory's hardware design files, code that implements the prototyping platform</a>, the accessory's hardware design files, code that implements the
accessory's firmware, and the Android application that interacts with the accessory. The hardware accessory's firmware, and the Android application that interacts with the accessory. The hardware
design files and firmware code are contained in the <a href=ctive design files and firmware code are contained in the <a href=
"https://dl-ssl.google.com/android/adk/adk_release_0512.zip">ADK package download</a>.</p> "https://dl-ssl.google.com/android/adk/adk_release_0512.zip">ADK package download</a>.</p>
<p>The main hardware and software components of the ADK include:</p> <p>The main hardware and software components of the ADK include:</p>