| commit | 484f132e80d2f3f8a7f90fcaf909268c4c480559 | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Wed Nov 08 23:34:21 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 08 23:34:21 2023 +0000 |
| tree | 7a4f22825917c497fcbf7ee5fc09699028245d51 | |
| parent | 4664d1d7384702d21526f0f4525b828b5961169c [diff] | |
| parent | 81c77fdef08592e8e6756e21ababb05e04dd8cea [diff] |
[automerger skipped] Merge "Revert "redbull: Replace NFC app with NFC apex"" into main am: 7836246080 am: 6028a9c8f6 am: 81c77fdef0 -s ours am skip reason: Merged-In I3cae59c33073df2c7f6a1546db72b4ed8478814a with SHA-1 a1a475d8ad is already in history Original change: https://android-review.googlesource.com/c/device/google/redbull/+/2818764 Change-Id: Id6101aca131e6399a1c37f92f487c6d272a8f648 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 a3fb90e..c61fc04 100644 --- a/device-common.mk +++ b/device-common.mk
@@ -1031,7 +1031,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>