Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / core / 9400b701404bfcc513f0ca3332f3a7bccb988295
commit9400b701404bfcc513f0ca3332f3a7bccb988295[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Thu Apr 21 03:09:02 2022 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Thu Apr 21 03:09:02 2022 +0000
tree52f2e641c2312374c338e45310f474f7a5ab7aaa
parent173982f21eb6014bd5b9a752d5f8c9e473c60b92 [diff]
parent401c4ba5ffb8678c278dd0b9aba5ab3269c543f0 [diff]
Merge "Merge "Merge "Merge "resolve merge conflicts of 21ef3ae3fd1dd2076c3b97efa09b3d58e799ce9f to android11-tests-dev" into android11-tests-dev am: bdf02cc54d" into android12-tests-dev am: fdca6ffb38" into android12L-tests-dev am: c1a6b27d21" am: c3c2643a8b am: 5639819569 am: bab2b5417f am: ac8a0291ac am: 401c4ba5ff

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1726290

Change-Id: Icb012fc3b9d39f4cd15bbe875b3d17f32577a167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 52f2e641c2312374c338e45310f474f7a5ab7aaa
  1. bootstat/
  2. cli-test/
  3. code_coverage/
  4. debuggerd/
  5. diagnose_usb/
  6. fastboot/
  7. fs_mgr/
  8. gatekeeperd/
  9. healthd/
  10. include/
  11. init/
  12. janitors/
  13. libappfuse/
  14. libasyncio/
  15. libbinderwrapper/
  16. libcrypto_utils/
  17. libcutils/
  18. libdiskconfig/
  19. libgrallocusage/
  20. libkeyutils/
  21. libmodprobe/
  22. libnetutils/
  23. libpackagelistparser/
  24. libprocessgroup/
  25. libsparse/
  26. libstats/
  27. libsuspend/
  28. libsync/
  29. libsystem/
  30. libsysutils/
  31. libusbhost/
  32. libutils/
  33. libvndksupport/
  34. llkd/
  35. mini_keyctl/
  36. mkbootfs/
  37. property_service/
  38. reboot/
  39. rootdir/
  40. run-as/
  41. sdcard/
  42. set-verity-state/
  43. shell_and_utilities/
  44. storaged/
  45. toolbox/
  46. trusty/
  47. usbd/
  48. watchdogd/
  49. .clang-format ⇨ .clang-format-4
  50. .clang-format-2 ⇨ ../../build/soong/scripts/system-clang-format-2
  51. .clang-format-4 ⇨ ../../build/soong/scripts/system-clang-format
  52. rustfmt.toml ⇨ ../../build/soong/scripts/rustfmt.toml
  53. .gitignore
  54. CleanSpec.mk
  55. METADATA
  56. MODULE_LICENSE_APACHE2
  57. OWNERS
  58. PREUPLOAD.cfg