Merge cherrypicks of ['googleplex-android-review.googlesource.com/30112268'] into 25D4-release.
Change-Id: Ie16a26ec0874e2d0cad338c927c22627dcc94123
This commit is contained in:
commit
e3b4214ec8
2 changed files with 4 additions and 4 deletions
|
@ -108,8 +108,8 @@
|
|||
"Formula":"MAXIMUM",
|
||||
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"],
|
||||
"Coefficient":[1.0, 1.0],
|
||||
"HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
|
||||
"HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
|
||||
"HotThreshold":["NAN", 34.0, 39.0, 41.0, 45.0, 47.0, 55.0],
|
||||
"HotHysteresis":[0.0, 1.9, 4.9, 1.9, 3.9, 1.9, 1.9],
|
||||
"Multiplier":0.001,
|
||||
"PollingDelay":300000,
|
||||
"PassiveDelay":7000,
|
||||
|
|
|
@ -873,8 +873,8 @@
|
|||
"Formula":"MAXIMUM",
|
||||
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"],
|
||||
"Coefficient":[1.0, 1.0],
|
||||
"HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
|
||||
"HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
|
||||
"HotThreshold":["NAN", 34.0, 39.0, 41.0, 45.0, 47.0, 55.0],
|
||||
"HotHysteresis":[0.0, 1.9, 4.9, 1.9, 3.9, 1.9, 1.9],
|
||||
"Multiplier":0.001,
|
||||
"PollingDelay":300000,
|
||||
"PassiveDelay":7000,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue