Gitiles
Code Review Sign In
review.blissroms.org / platform_system_core_old / e7696053982d26c223e5cfc3f7a41a14dc2450ab
commite7696053982d26c223e5cfc3f7a41a14dc2450ab[log] [tgz]
authorElliott Hughes <enh@google.com>Wed Apr 25 17:08:17 2018 -0700
committerElliott Hughes <enh@google.com>Wed Apr 25 17:08:17 2018 -0700
tree0e554366cfe4f4a167f386ce8c5148d42604796b
parent9cffb11dc578768d5eaaa12d92de19d7be52e574 [diff]
parentdb975e38db61fd8c6b7066b6677e5ffa6a4bf0d0 [diff]
resolve merge conflicts of 78495e02d6c620124f9dd37bbf55c318da969e52 to pi-dev-plus-aosp

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id2f223c1f5f9ca7924de7a58825ff10bc62b490e
tree: 0e554366cfe4f4a167f386ce8c5148d42604796b
  1. adb/
  2. adf/
  3. base/
  4. bootstat/
  5. cpio/
  6. debuggerd/
  7. demangle/
  8. diagnose_usb/
  9. fastboot/
  10. fs_mgr/
  11. gatekeeperd/
  12. healthd/
  13. include/
  14. init/
  15. libappfuse/
  16. libasyncio/
  17. libbacktrace/
  18. libbinderwrapper/
  19. libcrypto_utils/
  20. libcutils/
  21. libdiskconfig/
  22. libgrallocusage/
  23. libion/
  24. libkeyutils/
  25. liblog/
  26. libmemtrack/
  27. libmemunreachable/
  28. libmetricslogger/
  29. libnativebridge/
  30. libnativeloader/
  31. libnetutils/
  32. libpackagelistparser/
  33. libpixelflinger/
  34. libprocessgroup/
  35. libprocinfo/
  36. libqtaguid/
  37. libsparse/
  38. libsuspend/
  39. libsync/
  40. libsystem/
  41. libsysutils/
  42. libunwindstack/
  43. libusbhost/
  44. libutils/
  45. libvndksupport/
  46. libziparchive/
  47. llkd/
  48. lmkd/
  49. logcat/
  50. logd/
  51. logwrapper/
  52. mkbootimg/
  53. property_service/
  54. qemu_pipe/
  55. reboot/
  56. rootdir/
  57. run-as/
  58. sdcard/
  59. shell_and_utilities/
  60. storaged/
  61. toolbox/
  62. trusty/
  63. usbd/
  64. .clang-format ⇨ .clang-format-4
  65. .clang-format-2
  66. .clang-format-4
  67. .gitignore
  68. Android.bp
  69. Android.mk
  70. CleanSpec.mk
  71. MODULE_LICENSE_APACHE2
  72. NOTICE
  73. OWNERS
  74. platform_tools_tool_version.mk
  75. PREUPLOAD.cfg