tree 7a1ab174db24a7dfcba3ffed2878f7c837083e22
parent 14a6284db20df3e1d3e7e27842be8d723616f823
parent 3e44f3b231c027f01290367049f2244514f22d16
author Raphael <raphael@google.com> 1249617845 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1249617845 -0700

am 3e44f3b2: Revert "Split AdbWinApi.dll into two dlls to remove dependency on WINUSB.DLL" which breaks the Windows SDK on Donut.

Merge commit '3e44f3b231c027f01290367049f2244514f22d16'

* commit '3e44f3b231c027f01290367049f2244514f22d16':
  Revert "Split AdbWinApi.dll into two dlls to remove dependency on WINUSB.DLL"