Merge cherrypicks of ['googleplex-android-review.googlesource.com/24151204'] into udc-release.
Change-Id: Ic8a9fa621803605d974ee1fee976d1f659f4728d
This commit is contained in:
commit
93f7fee8fa
2 changed files with 2 additions and 2 deletions
|
@ -244,7 +244,7 @@
|
|||
"Formula":"MAXIMUM",
|
||||
"Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"],
|
||||
"Coefficient":[1.0, 1.0],
|
||||
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 51.0, 54.0],
|
||||
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 53.0, 57.0],
|
||||
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
|
||||
"Multiplier":0.001,
|
||||
"PollingDelay":300000,
|
||||
|
|
|
@ -244,7 +244,7 @@
|
|||
"Formula":"MAXIMUM",
|
||||
"Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"],
|
||||
"Coefficient":[1.0, 1.0],
|
||||
"HotThreshold":["NAN", 37.0, 41.0, 45.0, 46.5, 51.0, 54.0],
|
||||
"HotThreshold":["NAN", 37.0, 41.0, 45.0, 46.5, 53.0, 57.0],
|
||||
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
|
||||
"Multiplier":0.001,
|
||||
"PollingDelay":300000,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue