[automerger skipped] Merge "thermal: modify emergency and shutdown threshold for VIRTUAL-SKIN" into udc-dev am: bb1fe7d3fe
am: c9cb0104be
-s ours am: 91a348a990
-s ours
am skip reason: Merged-In I1327be31f164a9e4263fb9c5381adc09378b19c5 with SHA-1 3a0c866fa5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24151204
Change-Id: Ia37b15a395346c1f7e0f933ecd75ceead58c2b96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
93032aaab6