Google Git
Sign in
android / platform / system / extras / 472ef7a851f8c24cb3bd39551ddfc6b0bdb5ecc4
commit472ef7a851f8c24cb3bd39551ddfc6b0bdb5ecc4[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri Apr 19 01:38:45 2024 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri Apr 19 01:38:45 2024 +0000
tree80d4df3e80ceba87213962bc9d0c4d0927f51830
parent35dccce0a7b5bfb5819e752690aa5cd0f110d527 [diff]
parent04d7e66ade372e911ede07d4514688b83d7ac12c [diff]
[automerger skipped] Merge "Merge "Merge "simpleperf: Fix flaky test check_trampoline_after_art_jni_methods" into android12-tests-dev am: e4cc9c7725" into android12L-tests-dev am: 6b5a8b2336" into android13-tests-dev am: 57b29e5ba9 -s ours am: 04d7e66ade -s ours

am skip reason: Merged-In I846cd2bbf1159abf05e9d754c2e96c12912c7d72 with SHA-1 31ec381052 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/3049053

Change-Id: Ieefaaeceb1f3686c899492f2531aa4ac82260eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 80d4df3e80ceba87213962bc9d0c4d0927f51830
  1. alloc-stress/
  2. ANRdaemon/
  3. app-launcher/
  4. boot_control_copy/
  5. bootctl/
  6. boottime_tools/
  7. brillo_config/
  8. checkpoint_gc/
  9. cppreopts/
  10. cpu_loads/
  11. cpustats/
  12. ext4_utils/
  13. f2fs_utils/
  14. ioblame/
  15. ioshark/
  16. iotop/
  17. kcmdlinectrl/
  18. kexec_tools/
  19. latencytop/
  20. libatrace_rust/
  21. libfec/
  22. libfscrypt/
  23. libjsonpb/
  24. memory_replay/
  25. memtrack/
  26. mmap-perf/
  27. module_ndk_libs/
  28. mtectrl/
  29. multinetwork/
  30. pagecache/
  31. partition_tools/
  32. perf2cfg/
  33. perf_tools/
  34. pinner/
  35. postinst/
  36. power_profile/
  37. preopt2cachename/
  38. profcollectd/
  39. pssbench/
  40. runconuid/
  41. sane_schedstat/
  42. showslab/
  43. simpleperf/
  44. slideshow/
  45. sound/
  46. squashfs_utils/
  47. su/
  48. systrace_analysis/
  49. taskstats/
  50. tests/
  51. toolchain-extras/
  52. tools/
  53. vbmeta_tools/
  54. verity/
  55. zram-perf/
  56. .clang-format ⇨ .clang-format-4
  57. .clang-format-2 ⇨ ../../build/soong/scripts/system-clang-format-2
  58. .clang-format-4 ⇨ ../../build/soong/scripts/system-clang-format
  59. rustfmt.toml ⇨ ../../build/soong/scripts/rustfmt.toml
  60. .clang-format-none
  61. Android.mk
  62. CleanSpec.mk
  63. METADATA
  64. PREUPLOAD.cfg