[automerger skipped] Convert BatteryUsageStats to and from XML am: d82aa7e5c4 am: 71f5b12c59 -s ours

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

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

Change-Id: I6f7f2dc4ab004941c21518726de5b642cbecbce0
This commit is contained in:
Dmitri Plotnikov
2021-06-17 18:56:39 +00:00
committed by Automerger Merge Worker

Diff Content Not Available