Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / packages / modules / adb / 4d59f4d899b46a333ed9bc62b356a3561000cdd3
commit4d59f4d899b46a333ed9bc62b356a3561000cdd3[log] [tgz]
authorThe Android Open Source Project <initial-contribution@android.com>Thu Jul 22 09:20:31 2010 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>Thu Jul 22 09:20:31 2010 -0700
tree23cebf4a7ed2c3d50555324ae774c64d46552d0a
parentabb50a06952a5df14669ce9c96d318c49a8d5814 [diff]
parent4825f03c7eb95b7afdc22d5d66d2d00ce2c200e4 [diff]
am 4825f03c: merge from open-source master

Merge commit '4825f03c7eb95b7afdc22d5d66d2d00ce2c200e4'

* commit '4825f03c7eb95b7afdc22d5d66d2d00ce2c200e4':
  Added NEC and PMC's USB VIDs upon their request.
tree: 23cebf4a7ed2c3d50555324ae774c64d46552d0a
  1. adb.c
  2. adb.h
  3. adb_client.c
  4. adb_client.h
  5. Android.mk
  6. commandline.c
  7. console.c
  8. fdevent.c
  9. fdevent.h
  10. file_sync_client.c
  11. file_sync_service.c
  12. file_sync_service.h
  13. framebuffer_service.c
  14. get_my_path_darwin.c
  15. get_my_path_freebsd.c
  16. get_my_path_linux.c
  17. get_my_path_windows.c
  18. jdwp_service.c
  19. log_service.c
  20. MODULE_LICENSE_APACHE2
  21. mutex_list.h
  22. NOTICE
  23. OVERVIEW.TXT
  24. protocol.txt
  25. remount_service.c
  26. services.c
  27. SERVICES.TXT
  28. sockets.c
  29. sockets.dia
  30. sysdeps.h
  31. sysdeps_win32.c
  32. test_track_devices.c
  33. test_track_jdwp.c
  34. transport.c
  35. transport_local.c
  36. transport_usb.c
  37. usb_libusb.c
  38. usb_linux.c
  39. usb_linux_client.c
  40. usb_osx.c
  41. usb_vendors.c
  42. usb_vendors.h
  43. usb_windows.c
  44. utils.c
  45. utils.h