[automerger skipped] Merge SP2A.220505.002 am: 3358d824f3 -s ours

am skip reason: Merged-In Ic2ed06886679671a04a35f86665cb147b8103905 with SHA-1 2f02dcb4ff is already in history

Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2085708

Change-Id: Ie67eaf95f66dde6efecfdeb814b510e2c24223b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 5cf831cca8746abd1d8c80491f4ef41ac309b172
  1. acdbdata/
  2. audio/
  3. bonito/
  4. bootctrl/
  5. dumpstate/
  6. factory-images_bonito/
  7. factory-images_sargo/
  8. gpt-utils/
  9. health/
  10. json-c/
  11. keymaster/
  12. nfc/
  13. overlay/
  14. permissions/
  15. pixelstats/
  16. powerstats/
  17. rro_overlays/
  18. sargo/
  19. sdm710/
  20. seccomp_policy/
  21. self-extractors/
  22. self-extractors_sargo/
  23. sensors/
  24. usb/
  25. vibrator/
  26. voice_processing/
  27. .clang-format
  28. .gitignore
  29. Android.bp
  30. Android.mk
  31. AndroidProducts.mk
  32. aosp_bonito.mk
  33. aosp_bonito_hwasan.mk
  34. aosp_sargo.mk
  35. aosp_sargo_hwasan.mk
  36. audio_effects.xml
  37. audio_platform_info_intcodec_b4.xml
  38. audio_platform_info_intcodec_b4dev.xml
  39. audio_platform_info_intcodec_s4.xml
  40. audio_platform_info_intcodec_s4dev.xml
  41. audio_policy_configuration.xml
  42. audio_policy_configuration_a2dp_offload_disabled.xml
  43. audio_policy_configuration_bluetooth_legacy_hal.xml
  44. audio_policy_volumes.xml
  45. bluetooth_hearing_aid_audio_policy_configuration.xml
  46. board-info.txt
  47. BoardConfig-common.mk
  48. CleanSpec.mk
  49. compatibility_matrix.xml
  50. compatibility_matrix_userdebug.xml
  51. component-overrides.xml
  52. config.fs
  53. default-permissions.xml
  54. device-audio-mfg.mk
  55. device-bonito.mk
  56. device-common.mk
  57. device-sargo.mk
  58. device.mk
  59. device_framework_matrix.xml
  60. framework_manifest_userdebug.xml
  61. fstab.hardware
  62. gps.conf
  63. graphite_ipc_platform_info.xml
  64. init.edge_sense.sh
  65. init.fingerprint.sh
  66. init.firstboot.sh
  67. init.hardware.diag.rc.user
  68. init.hardware.diag.rc.userdebug
  69. init.hardware.mpssrfs.rc.user
  70. init.hardware.mpssrfs.rc.userdebug
  71. init.hardware.rc
  72. init.hardware.usb.rc
  73. init.insmod.cfg
  74. init.insmod.sh
  75. init.logging.rc
  76. init.power.rc
  77. init.qcom.devstart.sh
  78. init.qcom.ipastart.sh
  79. init.qcom.wlan.sh
  80. init.radio.sh
  81. init.ramoops.sh
  82. init.recovery.hardware.device.rc
  83. init.recovery.hardware.rc
  84. lowi.conf
  85. manifest.xml
  86. media_codecs.xml
  87. media_codecs_omx.xml
  88. media_codecs_performance.xml
  89. media_profiles_V1_0.xml
  90. METADATA
  91. mixer_paths_intcodec_b4.xml
  92. mixer_paths_intcodec_s4.xml
  93. OWNERS
  94. p2p_supplicant_overlay.conf
  95. powerhint.json
  96. product.prop
  97. recovery.wipe
  98. sec_config
  99. sound_trigger_mixer_paths.xml
  100. sound_trigger_platform_info.xml
  101. thermal-engine-bonito.conf
  102. thermal-engine-sargo.conf
  103. thermal_info_config_bonito.json
  104. thermal_info_config_sargo.json
  105. ueventd.hardware.rc
  106. uinput-fpc.idc
  107. uinput-fpc.kl
  108. utils.mk
  109. WCNSS_qcom_cfg.ini
  110. wifi_concurrency_cfg.txt
  111. wpa_supplicant_overlay.conf
  112. wpa_supplicant_wcn.conf