Google Git
Sign in
android / platform / system / extras / 6df0a78dd6569195b7ba363372a4c911eebe83a6
commit6df0a78dd6569195b7ba363372a4c911eebe83a6[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri Apr 19 01:29:18 2024 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>Fri Apr 19 01:29:18 2024 +0000
tree5b929bcc6607b4d772e4ba0ea4ab6da8caeb1a1e
parent8961961b842be207ed91b1c137dc6eea2a13acb0 [diff]
parent04d7e66ade372e911ede07d4514688b83d7ac12c [diff]
Merge changes from topic "am-4212e85279cd4af49081bfd97be33764" into android14-tests-dev

* changes:
  [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
  [automerger skipped] Merge "Merge "simpleperf: Fix flaky test check_trampoline_after_art_jni_methods" into android12-tests-dev am: e4cc9c7725" into android12L-tests-dev am: 6b5a8b2336 am: 5cec5340a8 -s ours
tree: 5b929bcc6607b4d772e4ba0ea4ab6da8caeb1a1e
  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. crypto-perf/
  13. ext4_utils/
  14. f2fs_utils/
  15. ioblame/
  16. ioshark/
  17. iotop/
  18. kexec_tools/
  19. latencytop/
  20. libfec/
  21. libfscrypt/
  22. libjsonpb/
  23. memory_replay/
  24. memtrack/
  25. mmap-perf/
  26. module_ndk_libs/
  27. mtectrl/
  28. multinetwork/
  29. pagecache/
  30. partition_tools/
  31. perf2cfg/
  32. perf_tools/
  33. postinst/
  34. power_profile/
  35. preopt2cachename/
  36. profcollectd/
  37. pssbench/
  38. runconuid/
  39. sane_schedstat/
  40. setuclamp/
  41. showslab/
  42. simpleperf/
  43. slideshow/
  44. sound/
  45. squashfs_utils/
  46. su/
  47. systrace_analysis/
  48. taskstats/
  49. tests/
  50. toolchain-extras/
  51. tools/
  52. vbmeta_tools/
  53. verity/
  54. zram-perf/
  55. .clang-format ⇨ .clang-format-4
  56. .clang-format-2 ⇨ ../../build/soong/scripts/system-clang-format-2
  57. .clang-format-4 ⇨ ../../build/soong/scripts/system-clang-format
  58. rustfmt.toml ⇨ ../../build/soong/scripts/rustfmt.toml
  59. .clang-format-none
  60. Android.mk
  61. CleanSpec.mk
  62. METADATA
  63. PREUPLOAD.cfg