| commit | f7e9327067a0cef45208034e67ffacc5e7d531ec | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 07 00:19:45 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 07 00:19:45 2023 +0000 |
| tree | 54ea6c335a13da552b1f321e067140bb77d5fd6b | |
| parent | 5cfefa900e8aa795f8cce14aacfe47a3d9d8bb1a [diff] | |
| parent | c7b621511874901652b72cdfdd6dd4073d60bfa7 [diff] |
[automerger skipped] Merge Android 14 am: ee8a545efd -s ours am: 4b3bf0cb92 -s ours am: 9cf94b1263 -s ours am: 0ece8f24d6 -s ours am: c7b6215118 -s ours am skip reason: Merged-In I02c6f67e9f820e6b895f7bdc9bc483ca43e267d7 with SHA-1 cbe8968d19 is already in history Original change: https://android-review.googlesource.com/c/device/google/redbull/+/2774999 Change-Id: I110524cd32109f6db4ce79609488e8b4b0c06e90 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/device-common.mk b/device-common.mk index 0bbb1cd..f850422 100644 --- a/device-common.mk +++ b/device-common.mk
@@ -1034,7 +1034,7 @@ -include hardware/google/pixel/pixelstats/device.mk # thermal --include hardware/google/pixel/thermal/device.mk +include device/google/gs-common/thermal/thermal_hal/device.mk # power HAL -include hardware/google/pixel/power-libperfmgr/aidl/device.mk
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 2401dd7..5860544 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml
@@ -222,7 +222,7 @@ </hal> <hal format="aidl" optional="true"> <name>vendor.google.wifi_ext</name> - <version>1</version> + <version>2-3</version> <interface> <name>IWifiExt</name> <instance>default</instance>