| commit | 5cfefa900e8aa795f8cce14aacfe47a3d9d8bb1a | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 29 10:20:31 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 29 10:20:31 2023 +0000 |
| tree | 54ea6c335a13da552b1f321e067140bb77d5fd6b | |
| parent | c28527efb003b01ca341b2fbb4a22dcdbf16f6e0 [diff] | |
| parent | 26508edf85eccdffb4cd4c37db17161e9067b56a [diff] |
[automerger skipped] Merge UP1A.231005.007 am: 8b43078bb9 -s ours am: 2ef4e321a2 -s ours am: 3eca31ebca -s ours am: 26508edf85 -s ours am skip reason: Merged-In I02c6f67e9f820e6b895f7bdc9bc483ca43e267d7 with SHA-1 2ba9a8b670 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/redbull/+/24878746 Change-Id: I185aae4e9d00033b2d088f69129bd6ca7d270a68 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>