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

Commit 6936b956 authored by Chiachang Wang's avatar Chiachang Wang
Browse files

merge conflicts of c564b6e1 to pi-dev-plus-aosp 

Test: Fix conflict as instruction
Bug: None
Change-Id: Iebce2651c795abd223c2df1ae5ddf168351d70ad
Merged-In: I96f74d938663d579e4fea1eee6a4a250d7e21b3a
parent bcfa1bfe

cmds/statsd/src/atoms.proto

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ message Atom { 
        PhoneServiceStateChanged phone_service_state_changed = 94;

        PhoneStateChanged phone_state_changed = 95;

        LowMemReported low_mem_reported = 81;

        ThermalThrottlingStateChanged thermal_throttling = 86;

        NetworkDnsEventReported network_dns_event_reported = 116;

        DataStallEvent data_stall_event = 121;

    }