tree b39150f75adbe4081010ac62c0a1a5e5ee4f43a7
parent f72a0e71b9793c41aca2bf20306b3c71c0570eab
parent 9fc057aab4f08e5a40de665549f48bece0c7bd63
author Scott Main <smain@google.com> 1329359760 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329359760 -0800

am 9fc057aa: 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 '9fc057aab4f08e5a40de665549f48bece0c7bd63':