Google Git
Sign in
android / device / google / coral / 3c4ffde498bf9bc6be2ec36d37d686216fcb5f97
commit3c4ffde498bf9bc6be2ec36d37d686216fcb5f97[log] [tgz]
authorXin Li <[email protected]>Thu Mar 07 09:55:24 2024 +0000
committerAutomerger Merge Worker <[email protected]>Thu Mar 07 09:55:24 2024 +0000
treef262d927c12b6c044307b308b79b505eac59615f
parent788a9550a8889315c5f49b52627116ca330ac029 [diff]
parent3bef04c21715e186d81f18b5f7139c2ef06a31e7 [diff]
[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 3bef04c217 -s ours

am skip reason: Merged-In I15efa68487a4076f8ab0d243bd1ebe4c124d0a5f with SHA-1 788a9550a8 is already in history

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

Change-Id: Ifde40b5d7e06971754a62d47453762c2e6c76ce0
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: f262d927c12b6c044307b308b79b505eac59615f
  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