Gitiles
Code Review Sign In
review.blissroms.org / platform_packages_modules_adb / 37c0f450c52fc7f637070b6cb70c6e454e68e6ae
commit37c0f450c52fc7f637070b6cb70c6e454e68e6ae[log] [tgz]
authorBenoit Goby <benoit@android.com>Fri Mar 29 16:29:22 2013 -0700
committerBenoit Goby <benoit@android.com>Fri Mar 29 16:29:22 2013 -0700
tree81e1c96f0c1f0a5c55ca62c424ba1f0bd9ec10bd
parent775c05919ab3d033f8a53ff9570fb6d530ecfc8a [diff]
parent22d1059446e8563e1f0aa5586139752d43e2b151 [diff]
resolved conflicts for merge of 22d10594 to jb-mr2-dev-plus-aosp

Change-Id: I754b8b17a7e3a6e4ef3ccf0a02beca0fc72ba749
tree: 81e1c96f0c1f0a5c55ca62c424ba1f0bd9ec10bd
  1. adb.c
  2. adb.h
  3. adb_auth.h
  4. adb_auth_client.c
  5. adb_auth_host.c
  6. adb_client.c
  7. adb_client.h
  8. Android.mk
  9. backup_service.c
  10. commandline.c
  11. console.c
  12. fdevent.c
  13. fdevent.h
  14. file_sync_client.c
  15. file_sync_service.c
  16. file_sync_service.h
  17. framebuffer_service.c
  18. get_my_path_darwin.c
  19. get_my_path_freebsd.c
  20. get_my_path_linux.c
  21. get_my_path_windows.c
  22. jdwp_service.c
  23. log_service.c
  24. MODULE_LICENSE_APACHE2
  25. mutex_list.h
  26. NOTICE
  27. OVERVIEW.TXT
  28. protocol.txt
  29. remount_service.c
  30. services.c
  31. SERVICES.TXT
  32. sockets.c
  33. sockets.dia
  34. sysdeps.h
  35. sysdeps_win32.c
  36. test_track_devices.c
  37. test_track_jdwp.c
  38. transport.c
  39. transport.h
  40. transport_local.c
  41. transport_usb.c
  42. usb_libusb.c
  43. usb_linux.c
  44. usb_linux_client.c
  45. usb_osx.c
  46. usb_vendors.c
  47. usb_vendors.h
  48. usb_windows.c
  49. utils.c
  50. utils.h