tree e3d6ec7b18c6f8cbbc60f9113cead1c761393be0
parent 47c59b48357d875a6a0278e945e4c08700886b37
parent 2198945e3231f3a2fc2b1e8d00bfa8f322abfd3a
author Scott Main <smain@google.com> 1362518031 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362518031 -0800

am 2198945e: am 95120553: am fbd852ba: am 9ecd8e7b: am d346b311: Merge "docs: add MTK usb driver info" into jb-mr1-dev

* commit '2198945e3231f3a2fc2b1e8d00bfa8f322abfd3a':