tree c819f921f5d728f11fdf86b83b278bdfa9406722
parent 76d857639efa3e5fd01553a26b6742a6895d189f
parent fbd852baccce55ee6fdc082e905e92adf7bc347d
author Scott Main <smain@google.com> 1362517597 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362517597 -0800

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

* commit 'fbd852baccce55ee6fdc082e905e92adf7bc347d':