| commit | e0f6a2121d074b18ea59a992f57c89a1db489f9c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Oct 19 23:54:36 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 19 23:54:36 2023 +0000 |
| tree | 6e2da120da0ce305c3062f46c51bacb245ecf0da | |
| parent | 03165cb14e37884ef1dca82b14911669e3d282e0 [diff] | |
| parent | f22c8fb31f26745efcd8341ad9c482f25e7467c7 [diff] |
[automerger skipped] Merge 10952656 am: d888d7aa3b -s ours am: f22c8fb31f -s ours am skip reason: Merged-In Id41c86d1f6098244dc91bb8e0c689f3015cf6755 with SHA-1 c7b6215118 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/redbull/+/25090357 Change-Id: Ife4720b8ee05a2fd9154237836f6e3e89a4b56a8 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 2d14f84..811279b 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>