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

Skip to content
Commit 1cf6c507 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Automerger Merge Worker
Browse files

[automerger skipped] Convert BatteryUsageStats to and from XML am: d82aa7e5... 

[automerger skipped] Convert BatteryUsageStats to and from XML am: d82aa7e5 am: 71f5b12c -s ours am: d387d846 -s ours

am skip reason: Merged-In I6aec09bfb87c1003ede1b24cce8cf474675d2448 with SHA-1 d82aa7e5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14924566

Change-Id: I857e023f0bc51260f60e8adaec163fca168c14fd
parents 0149f46d d387d846
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment