Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / packages / modules / adb / 4486ac2906299eabf9b241b07b8d0a165f05bccf
commit4486ac2906299eabf9b241b07b8d0a165f05bccf[log] [tgz]
authorXavier Ducrohet <xav@android.com>Tue May 15 11:29:59 2012 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>Tue May 15 11:29:59 2012 -0700
tree6ec3dc8b877bcbf56c7b7a362329e3174803232a
parent19d6e83b14d9c9aec88968f98ba5407d8cac2514 [diff]
parentf70ea0de4573b2f0ad8416b0808bedc15b9306d4 [diff]
am f70ea0de: resolved conflicts for merge of 1d777590 to jb-dev-plus-aosp

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