commit | aee3acd9e44c996643db7805589327e34ac12291 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 22 09:20:31 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 22 09:20:31 2010 -0700 |
tree | 32022e9ac230439e5db88e48a4c0296b84ac1e47 | |
parent | 29a96aff5f8b3e4370684064f6a72b33b5d71785 [diff] | |
parent | ef582bdb8f24197caf921af7bf7ee63503626cdd [diff] |
am ef582bdb: merge from open-source master Merge commit 'ef582bdb8f24197caf921af7bf7ee63503626cdd' * commit 'ef582bdb8f24197caf921af7bf7ee63503626cdd': Added NEC and PMC's USB VIDs upon their request.