| commit | e8831cb573307e9d7a27e633768e3397f7ef2182 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Sep 05 21:26:54 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 05 21:26:54 2023 +0000 |
| tree | 195bf2981222d496146b048a264783c7daa56678 | |
| parent | 5abbe514e8252ee6dd4460937defb6e3ea862429 [diff] | |
| parent | d0e70ee3a57c88a829e11878531db382b3f53002 [diff] |
[automerger skipped] Merge UP1A.230905.019 am: 3e9a7f5242 -s ours am: 6c4cddc799 -s ours am: 92eea7d7c8 -s ours am: d0e70ee3a5 -s ours am skip reason: Merged-In Iff37b366a8c54c913b36115319ed0c4e025b2a70 with SHA-1 1bfdea9aa9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/device/google/redbull/+/24623864 Change-Id: Ib025f5d340ead7a1157ae1a7fbfe65e611d4ea15 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 a9f57e3..d4505e9 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>