Skip to content
Commit cd1863ea authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Added Ble scan APIs to BatteryStatsManager" am:... 

[automerger skipped] Merge "Added Ble scan APIs to BatteryStatsManager" am: 54c9ff98 am: 4c22f155 -s ours am: b48e9aa7 -s ours

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

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

Change-Id: I2374e8bf59b846074743ada8ae0e90618bdc3588
parents 2d3d0c17 b48e9aa7
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