Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / packages / modules / adb / 4e940c0ecb0b485576800df16ab65bb23281cc78
commit4e940c0ecb0b485576800df16ab65bb23281cc78[log] [tgz]
authorJosh Gao <jmgao@google.com>Thu Aug 04 22:04:05 2016 -0700
committerJosh Gao <jmgao@google.com>Thu Aug 04 22:04:05 2016 -0700
treea6adb870cdb3dd815f7e113ffc81eacca432911d
parent573af9ae38a75068c1d3229c1f2f681811baf960 [diff]
parenta408fd2d10bb4eefb8c6552e80690eb42e903d48 [diff]
resolve merge conflicts of e012de5 to stage-aosp-master

Change-Id: I3d9f8b4421fa6122261dbd821561a2236f810a47
tree: a6adb870cdb3dd815f7e113ffc81eacca432911d
  1. client/
  2. daemon/
  3. sysdeps/
  4. .clang-format
  5. adb.cpp
  6. adb.h
  7. adb_auth.cpp
  8. adb_auth.h
  9. adb_auth_client.cpp
  10. adb_auth_host.cpp
  11. adb_client.cpp
  12. adb_client.h
  13. adb_io.cpp
  14. adb_io.h
  15. adb_io_test.cpp
  16. adb_listeners.cpp
  17. adb_listeners.h
  18. adb_listeners_test.cpp
  19. adb_trace.cpp
  20. adb_trace.h
  21. adb_utils.cpp
  22. adb_utils.h
  23. adb_utils_test.cpp
  24. Android.mk
  25. commandline.cpp
  26. console.cpp
  27. CPPLINT.cfg
  28. diagnose_usb.cpp
  29. diagnose_usb.h
  30. fdevent.cpp
  31. fdevent.h
  32. fdevent_test.cpp
  33. fdevent_test.h
  34. file_sync_client.cpp
  35. file_sync_service.cpp
  36. file_sync_service.h
  37. framebuffer_service.cpp
  38. get_my_path_darwin.cpp
  39. get_my_path_linux.cpp
  40. jdwp_service.cpp
  41. line_printer.cpp
  42. line_printer.h
  43. MODULE_LICENSE_APACHE2
  44. mutex_list.h
  45. NOTICE
  46. OVERVIEW.TXT
  47. protocol.txt
  48. remount_service.cpp
  49. remount_service.h
  50. security_log_tags.h
  51. services.cpp
  52. services.h
  53. SERVICES.TXT
  54. set_verity_enable_state_service.cpp
  55. shell_service.cpp
  56. shell_service.h
  57. shell_service_protocol.cpp
  58. shell_service_protocol_test.cpp
  59. shell_service_test.cpp
  60. socket.h
  61. socket_test.cpp
  62. sockets.cpp
  63. sockets.dia
  64. SYNC.TXT
  65. sysdeps.h
  66. sysdeps_test.cpp
  67. sysdeps_unix.cpp
  68. sysdeps_win32.cpp
  69. sysdeps_win32_test.cpp
  70. test_adb.py
  71. test_device.py
  72. transport.cpp
  73. transport.h
  74. transport_local.cpp
  75. transport_test.cpp
  76. transport_usb.cpp
  77. usb_linux.cpp
  78. usb_linux_client.cpp
  79. usb_osx.cpp
  80. usb_windows.cpp