tree e6af42ab200d4a1c01cf009b3919542e2a0051e7
parent 856b8e5e15b9904a51e2d0f638d92b2aa84dd831
parent 4c0900102b39c2e49afbeca0f7c87973e7b1a720
author Ajay Panicker <apanicke@google.com> 1500949608 +0000
committer android-build-merger <android-build-merger@google.com> 1500949608 +0000

Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev am: aaf3860941
am: 4c0900102b

Change-Id: I72bd4d4769ac95b2ef2e78426cfa38c29c51ea6e