[automerger skipped] Merge "coral: Replace NFC app with NFC apex" into main am: f5dee90c6b am: ef6d57e096 am: c1ea86da3d am: 9a04e09744 am: 177161d33a -s ours

am skip reason: Merged-In Id61049be3d12428d91ebd62f151f9ded7c054455 with SHA-1 27b2f884d7 is already in history

Original change: https://android-review.googlesource.com/c/device/google/coral/+/2779807

Change-Id: Iec66cb978791a2020e0be54f1bf74529cefd40aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 47937c16658e391b5b572646c67c0d8f82ccfc1e
  1. audio/
  2. bootctrl/
  3. coral/
  4. displayconfig/
  5. dumpstate/
  6. factory-images_coral/
  7. factory-images_flame/
  8. flame/
  9. gpt-utils/
  10. health/
  11. json-c/
  12. keymaster/
  13. nfc/
  14. overlay/
  15. pixelstats/
  16. powerstats/
  17. pwrstats_util/
  18. rro_overlays/
  19. seccomp_policy/
  20. self-extractors/
  21. self-extractors_flame/
  22. usb/
  23. voice_processing/
  24. .clang-format
  25. Android.bp
  26. Android.mk
  27. AndroidProducts.mk
  28. aosp_coral.mk
  29. aosp_coral_hwasan.mk
  30. aosp_flame.mk
  31. aosp_flame_hwasan.mk
  32. bluetooth_power_limits_coral.csv
  33. bluetooth_power_limits_flame.csv
  34. board-info.txt
  35. BoardConfig-common.mk
  36. CleanSpec.mk
  37. compatibility_matrix.xml
  38. component-overrides.xml
  39. config.fs
  40. default-permissions.xml
  41. device-common.mk
  42. device-coral.mk
  43. device-flame.mk
  44. device.mk
  45. device_framework_matrix_product.xml
  46. fstab.hardware
  47. fstab.persist
  48. fstab.postinstall
  49. gps.conf
  50. init.cat.rc.userdebug
  51. init.hardware.diag.rc.user
  52. init.hardware.diag.rc.userdebug
  53. init.hardware.mpssrfs.rc.user
  54. init.hardware.mpssrfs.rc.userdebug
  55. init.hardware.rc
  56. init.hardware.usb.rc
  57. init.hardware.userdebug.rc.userdebug
  58. init.hardware.wlc.rc.userdebug
  59. init.insmod.coral.cfg
  60. init.insmod.flame.cfg
  61. init.insmod.sh
  62. init.logging.rc
  63. init.mdm.sh
  64. init.msm.usb.configfs.rc
  65. init.power.rc
  66. init.qcom.modem_links.sh
  67. init.qcom.usb.rc
  68. init.qcom.usb.sh
  69. init.qti.getbootdevice.sh
  70. init.qti.qseecomd.sh
  71. init.radio.sh
  72. init.ramoops.sh
  73. init.recovery.device.rc
  74. init.sensors.sh
  75. manifest.xml
  76. media_codecs.xml
  77. media_codecs_omx.xml
  78. media_codecs_performance.xml
  79. media_codecs_vendor_audio.xml
  80. media_profiles.xml
  81. media_profiles_V1_0.xml
  82. METADATA
  83. OWNERS
  84. p2p_supplicant_overlay.conf
  85. powerhint.json
  86. product.prop
  87. recovery.wipe
  88. sec_config
  89. sensors.hals.conf
  90. thermal-engine-coral-normal_mode.conf
  91. thermal-engine-coral-retail_mode.conf
  92. thermal-engine-flame-normal_mode.conf
  93. thermal-engine-flame-retail_mode.conf
  94. thermal_info_config_coral.json
  95. thermal_info_config_coral_jaws.json
  96. thermal_info_config_flame.json
  97. thermal_info_config_flame_jaws.json
  98. ueventd.rc
  99. utils.mk
  100. WCNSS_qcom_cfg.ini
  101. wifi_concurrency_cfg.txt
  102. wpa_supplicant_overlay.conf
  103. wpa_supplicant_wcn.conf