| commit | 2dcfe08b4891a683f67a0170f65f5cd671b0ee4d | [log] [tgz] |
|---|---|---|
| author | Raphael <raphael@google.com> | Mon Nov 08 12:51:51 2010 -0800 |
| committer | Raphael <raphael@google.com> | Mon Nov 08 12:51:51 2010 -0800 |
| tree | bfbe48dd9a76eca33a04c1be7adb83d7c245bd2d | |
| parent | 80541cbaf309cabaa70000e82eba28ec5334cdc1 [diff] | |
| parent | 4e75b80a4d524fb3ac67d5c60676b030f68d2a4b [diff] |
Merge commit '4e75b80a' into merge Conflicts: host/windows/usb/android_winusb.inf Change-Id: I64a3be958e85302d0a6213d1c46ff9e7214ef352