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