[automerger skipped] Merge "thermal: modify emergency and shutdown threshold for VIRTUAL-SKIN" into udc-dev am: bb1fe7d3fe am: c9cb0104be -s ours am: ecfa562cb4 -s ours am: ae1a385932 -s ours

am skip reason: Merged-In I1327be31f164a9e4263fb9c5381adc09378b19c5 with SHA-1 be8156e83f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24151204

Change-Id: Ib72d124b309ab99e57ee70bb57077a32b21b7046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-07-27 13:35:11 +00:00 committed by Automerger Merge Worker
commit 9c21b15874

Diff content is not available