Skip to content
Commit 9fccdd14 authored by Bookatz's avatar Bookatz Committed by android-build-merger
Browse files

Merge "Batterystats handles nested unoptimized ble scans" am: 4627c01e -s ours 

am: 2fd6b1d7  -s ours

Change-Id: Iaad1877f6fbdee2beaa2328a3b3ee5025c468426
parents c1333187 2fd6b1d7
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