Gitiles
Code Review Sign In
review.blissroms.org / platform_packages_modules_adb / 7c4b143d76d394a524ff8c47fe85cd086883a057
commit7c4b143d76d394a524ff8c47fe85cd086883a057[log] [tgz]
authorJean-Baptiste Queru <jbq@google.com>Fri Feb 05 08:33:35 2010 -0800
committerJean-Baptiste Queru <jbq@google.com>Fri Feb 05 08:34:30 2010 -0800
tree274d31c924847c12911362f2f60dfa1f78fc5e87
parent463c1f150adef4c473298c877d09f7c74b354186 [diff]
parent568858d26fe911d370fdc0e02e46526096f300a9 [diff]
resolved conflicts for merge of 568858d2 to eclair-plus-aosp
tree: 274d31c924847c12911362f2f60dfa1f78fc5e87
  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. history.h
  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. shlist.c
  30. shlist.h
  31. sockets.c
  32. sockets.dia
  33. sysdeps.h
  34. sysdeps_win32.c
  35. test_track_devices.c
  36. test_track_jdwp.c
  37. transport.c
  38. transport_local.c
  39. transport_usb.c
  40. usb_libusb.c
  41. usb_linux.c
  42. usb_linux_client.c
  43. usb_osx.c
  44. usb_vendors.c
  45. usb_vendors.h
  46. usb_windows.c
  47. utils.c
  48. utils.h