tree e87e62bfcc77f93e6ed5aed3126ec63f59d28d50
parent b7b2c71bf8bf685af4c716e78d5c70decab98b54
parent ffc5a4a529338c834954e58de2701572eb0752f0
author Elliott Hughes <enh@google.com> 1366216057 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366216057 -0700

am ffc5a4a5: Merge "Add OUYA VID to known VID list"

* commit 'ffc5a4a529338c834954e58de2701572eb0752f0':
  Add OUYA VID to known VID list