commit 8567e68c65d08735972d723d28e4568894f79e70
author Scott Main <smain@google.com> Wed Feb 15 17:36:54 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 15 17:36:54 2012 -0800
tree 62ae95e5606b65456e4877a437dfcb3020b7cee1
parent bb83b1dc70a0df706401043c78916c8c501ebca4
parent e8bea79a351845f9e9a81c9e36c4a8a3ffedfb5c

am 09af1ade: am 2a1d1917: Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device set

* commit '09af1aded6dacf35cf54597cd81a636337bd9c9c':
  docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs.