Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c89849ef authored by Bill Yi's avatar Bill Yi Committed by android-build-merger
Browse files

Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release 

am: a17e32ac

Change-Id: Ic89321fcd57d67f603fcfec071d65f135e2bc3c4
parents ed732916 a17e32ac

libmetricslogger/include/metricslogger/metrics_logger.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -114,7 +114,7 @@ enum { 
    FIELD_BATTERY_RESISTANCE_UOHMS = 1448,

    FIELD_BATTERY_RESISTANCE_UOHMS = 1448,

    FIELD_BATTERY_CURRENT_UA = 1449,

    FIELD_BATTERY_CURRENT_UA = 1449,

    FIELD_HARDWARE_LOCATION = 1450,

    FIELD_HARDWARE_LOCATION = 1450,

    ACTION_BATTERY_CAUSED_SHUTDOWN = 1441,

    ACTION_BATTERY_CAUSED_SHUTDOWN = 1451,

};

};





enum {

enum {