Gitiles
Code Review Sign In
review.blissroms.org / platform_system_core_old / e83cf168ad1e776d2946a3c98503fe952c19afd5
commite83cf168ad1e776d2946a3c98503fe952c19afd5[log] [tgz]
authorMark Salyzyn <salyzyn@google.com>Thu Jun 14 15:06:32 2018 -0700
committerMark Salyzyn <salyzyn@google.com>Thu Jun 14 15:06:36 2018 -0700
tree183bdc631d019975a0acd6fd182959369218db7b
parentec70985c464683bcf1a35c9dae4475b040121f55 [diff]
parentf287d0a707a77ccafd859faca061a6b05cafec1d [diff]
resolve merge conflicts of ca57890a8049c0100d91f9974f446ad904b4cec4 to stage-aosp-master

Bug: 86671991
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia49d1a9311f6a7a84dd96c31f79ecdc3143084b2
tree: 183bdc631d019975a0acd6fd182959369218db7b
  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. libstats/
  39. libsuspend/
  40. libsync/
  41. libsystem/
  42. libsysutils/
  43. libunwindstack/
  44. libusbhost/
  45. libutils/
  46. libvndksupport/
  47. libziparchive/
  48. llkd/
  49. lmkd/
  50. logcat/
  51. logd/
  52. logwrapper/
  53. mkbootimg/
  54. property_service/
  55. qemu_pipe/
  56. reboot/
  57. rootdir/
  58. run-as/
  59. sdcard/
  60. shell_and_utilities/
  61. storaged/
  62. toolbox/
  63. trusty/
  64. usbd/
  65. .clang-format ⇨ .clang-format-4
  66. .clang-format-2
  67. .clang-format-4
  68. .gitignore
  69. Android.bp
  70. Android.mk
  71. CleanSpec.mk
  72. MODULE_LICENSE_APACHE2
  73. NOTICE
  74. OWNERS
  75. platform_tools_tool_version.mk
  76. PREUPLOAD.cfg