OSDN Git Service

Merge "Batterystats track background bad ble scan time" into oc-dev
authorJoe Onorato <joeo@google.com>
Wed, 31 May 2017 19:46:11 +0000 (19:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 May 2017 19:46:11 +0000 (19:46 +0000)
am: fe06de1fc2

Change-Id: Ibca369ace041435ce1f9a9997658b86fd4b5f087


Trivial merge