tree b2a556e25f3c8f2e36d5a409ea617d977cccc885
parent 3f5117f5822c74421bad2bcdb7eb211ffbae702d
parent 294ecd05e897bf60912818a9d1805a4f651dc0bd
author Conley Owens <cco3@android.com> 1350511759 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350511759 -0700

am 294ecd05: Merge "Added the Samsung Galaxy family VID and PID."

* commit '294ecd05e897bf60912818a9d1805a4f651dc0bd':