DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master

Bug: 120502534
Change-Id: Id4f4f66ffb8104d953957f1c44dff6f549a387bb
This commit is contained in:
Xin Li 2018-12-11 14:46:12 -08:00
commit 2f2f638fdf

View file

@ -116,7 +116,7 @@ enum {
FIELD_BATTERY_RESISTANCE_UOHMS = 1448,
FIELD_BATTERY_CURRENT_UA = 1449,
FIELD_HARDWARE_LOCATION = 1450,
ACTION_BATTERY_CAUSED_SHUTDOWN = 1441,
ACTION_BATTERY_CAUSED_SHUTDOWN = 1451,
};
enum {