[automerger skipped] Merge "Added Ble scan APIs to BatteryStatsManager" am: 54c9ff981e am: 4c22f15543 -s ours am: b48e9aa711 -s ours

Browse Source

am skip reason: Merged-In Ie6c6d3688d2da45956d57ea1dbc2cc4430f27783 with SHA-1 6222c48ad5 is already in history

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

Change-Id: I2374e8bf59b846074743ada8ae0e90618bdc3588

...

This commit is contained in:

Treehugger Robot

2021-07-19 16:23:16 +00:00

committed by Automerger Merge Worker

parent 2d3d0c17f6 b48e9aa711

commit cd1863ea09

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