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

Commit 1ba39aa5 authored by Joe Onorato's avatar Joe Onorato Committed by android-build-merger
Browse files

Merge changes I4e45afed,I2ea19f9a,I922d6f38 into nyc-dev 

am: 62b9ff49

* commit '62b9ff49':
  Add unit tests for BatteryStatsImpl.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
parents 520921ab 62b9ff49

core/java/android/os/BatteryStats.java

+1 −1
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ public abstract class BatteryStats implements Parcelable { 
            /**

             * The statistics associated with a particular service.

             */

            public abstract class Serv {

            public static abstract class Serv {



                /**

                 * Returns the amount of time spent started.