[automerger skipped] Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" am: 918e60b615 am: 3fe7534d30 am: f3fb6b3099 -s ours am: be50d6054b -s ours

Browse Source

am skip reason: Change-Id I3dac94ec06f673aa719e124f1ef3d8169f68f9fb with SHA-1 cfff482b8a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I686944597f8bee0e1e6f114088eb4406b2c4287b

...

This commit is contained in:

Aaron Huang

2021-03-05 09:18:59 +00:00

committed by Automerger Merge Worker

parent 4fab0a601a be50d6054b

commit cb587491c2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available