OSDN Git Service

Merge "Batterystats handles nested unoptimized ble scans" am: 4627c01ee4 -s ours
authorBookatz <bookatz@google.com>
Tue, 17 Oct 2017 19:35:22 +0000 (19:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Oct 2017 19:35:22 +0000 (19:35 +0000)
commit9fccdd14e5cdbe5d6e7b1361d75480bda072fba4
treefc818f03acd892066dae62f52bc40827978ca40a
parentc1333187cd04bda9a31434575f353dc3c7322fa5
parent2fd6b1d7cda5f07d9320c499e3d72a499a71abde
Merge "Batterystats handles nested unoptimized ble scans" am: 4627c01ee4  -s ours
am: 2fd6b1d7cd  -s ours

Change-Id: Iaad1877f6fbdee2beaa2328a3b3ee5025c468426