Gitiles
Code Review Sign In
gerrit.omnirom.org / android_system_core / d5531c3fafcaada5ab67f4143fbee19387e4ccb7
commitd5531c3fafcaada5ab67f4143fbee19387e4ccb7[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Wed Jun 07 22:44:32 2023 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Wed Jun 07 22:44:32 2023 +0000
treec526ea6abfd92c2a1b6473ae122ac8f99ca57aab
parentaa4531945362a7c85f80360e43d4bc0f2d73b6ca [diff]
parentb30ffaea193b0ce39dea03d41b6e7816ac5e34eb [diff]
[automerger skipped] Merge "Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37 am: b30ffaea19 -s ours

am skip reason: Merged-In Ic84901ce5af766338b2cab07c3cf10841ba9a150 with SHA-1 40b59a61fc is already in history

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

Change-Id: I4346f368dc445832bedb831fa9eefad6873f9548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: c526ea6abfd92c2a1b6473ae122ac8f99ca57aab
  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. libgrallocusage/
  19. libkeyutils/
  20. libmodprobe/
  21. libnetutils/
  22. libpackagelistparser/
  23. libprocessgroup/
  24. libsparse/
  25. libstats/
  26. libsuspend/
  27. libsync/
  28. libsystem/
  29. libsysutils/
  30. libusbhost/
  31. libutils/
  32. libvndksupport/
  33. llkd/
  34. mini_keyctl/
  35. mkbootfs/
  36. property_service/
  37. reboot/
  38. rootdir/
  39. run-as/
  40. sdcard/
  41. shell_and_utilities/
  42. storaged/
  43. toolbox/
  44. trusty/
  45. usbd/
  46. watchdogd/
  47. .clang-format ⇨ .clang-format-4
  48. .clang-format-2 ⇨ ../../build/soong/scripts/system-clang-format-2
  49. .clang-format-4 ⇨ ../../build/soong/scripts/system-clang-format
  50. rustfmt.toml ⇨ ../../build/soong/scripts/rustfmt.toml
  51. .gitignore
  52. CleanSpec.mk
  53. METADATA
  54. MODULE_LICENSE_APACHE2
  55. OWNERS
  56. PREUPLOAD.cfg