Raphael 2dcfe08b48 Merge commit '4e75b80a' into merge ...

Conflicts:
	host/windows/usb/android_winusb.inf

Change-Id: I64a3be958e85302d0a6213d1c46ff9e7214ef352

2010-11-08 12:51:51 -08:00

..

prebuilt

BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK

2009-08-11 11:47:30 -07:00

usb

Merge commit '4e75b80a' into merge

2010-11-08 12:51:51 -08:00

.gitignore

Update ignore file to include new ignoring patterns

2009-08-10 13:34:28 -07:00