diff options
| author | Nick Kralevich <nnk@google.com> | 2010-07-20 10:48:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-20 10:48:18 -0700 |
| commit | 72f3a00cc7b9a53120a4fb38a3d374d6d692618d (patch) | |
| tree | 7517ef4be30d5537199a9c60325fd8a604016df9 /libusbhost | |
| parent | f0a66c807b4cd7b561decc8d5c82d65537cf421a (diff) | |
| parent | 3fc108acf2b05153489730178c85b8db94f603af (diff) | |
| download | system_core-72f3a00cc7b9a53120a4fb38a3d374d6d692618d.tar.gz system_core-72f3a00cc7b9a53120a4fb38a3d374d6d692618d.tar.bz2 system_core-72f3a00cc7b9a53120a4fb38a3d374d6d692618d.zip | |
am 3fc108ac: am fad7204e: resolved conflicts for merge of 5f5d5c8c to gingerbread
Merge commit '3fc108acf2b05153489730178c85b8db94f603af'
* commit '3fc108acf2b05153489730178c85b8db94f603af':
validate the source of uevent messages
Diffstat (limited to 'libusbhost')
0 files changed, 0 insertions, 0 deletions