[automerger skipped] Inherit userspace_reboot.mk am: bc3bdf18d1 am: 22cd91c7a8 am: 8880cc243a -s ours
am skip reason: Change-Id If910e2a6baf8acaafc8bafdf8193ba7237f66f1a with SHA-1 b6f8fd66d0 is in history

Change-Id: I5aae94bab65298b85a60309b0c7a5f83f57b7af3
tree: f086844995c8d424621200fa0ced36e2ac08be20
  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. hidl/
  12. json-c/
  13. keymaster/
  14. nfc/
  15. overlay/
  16. pixelstats/
  17. powerstats/
  18. pwrstats_util/
  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. board-info.txt
  33. BoardConfig-common.mk
  34. CleanSpec.mk
  35. compatibility_matrix.xml
  36. component-overrides.xml
  37. config.fs
  38. default-permissions.xml
  39. device-common.mk
  40. device-coral.mk
  41. device-flame.mk
  42. device.mk
  43. device_framework_matrix_product.xml
  44. fstab.hardware
  45. fstab.postinstall
  46. gps.conf
  47. init.hardware.chamber.rc.userdebug
  48. init.hardware.diag.rc.user
  49. init.hardware.diag.rc.userdebug
  50. init.hardware.mpssrfs.rc.user
  51. init.hardware.mpssrfs.rc.userdebug
  52. init.hardware.rc
  53. init.hardware.usb.rc
  54. init.hardware.userdebug.rc.userdebug
  55. init.hardware.wlc.rc.userdebug
  56. init.insmod.coral.cfg
  57. init.insmod.flame.cfg
  58. init.insmod.sh
  59. init.logging.rc
  60. init.mdm.sh
  61. init.msm.usb.configfs.rc
  62. init.power.rc
  63. init.qcom.modem_links.sh
  64. init.qcom.usb.rc
  65. init.qcom.usb.sh
  66. init.qti.getbootdevice.sh
  67. init.qti.qseecomd.sh
  68. init.radio.sh
  69. init.ramoops.sh
  70. init.recovery.device.rc
  71. init.sensors.sh
  72. manifest.xml
  73. media_codecs.xml
  74. media_codecs_omx.xml
  75. media_codecs_performance.xml
  76. media_codecs_vendor_audio.xml
  77. media_profiles.xml
  78. media_profiles_V1_0.xml
  79. OWNERS
  80. p2p_supplicant_overlay.conf
  81. powerhint.json
  82. product.prop
  83. recovery.wipe
  84. sec_config
  85. sensors.hals.conf
  86. thermal-engine-coral-normal_mode.conf
  87. thermal-engine-coral-retail_mode.conf
  88. thermal-engine-flame-normal_mode.conf
  89. thermal-engine-flame-retail_mode.conf
  90. thermal_info_config_coral.json
  91. thermal_info_config_coral_jaws.json
  92. thermal_info_config_flame.json
  93. thermal_info_config_flame_jaws.json
  94. ueventd.rc
  95. utils.mk
  96. WCNSS_qcom_cfg.ini
  97. wifi_concurrency_cfg.txt
  98. wpa_supplicant_overlay.conf
  99. wpa_supplicant_wcn.conf