Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev

author Ajay Panicker <apanicke@google.com>

Tue, 25 Jul 2017 02:11:26 +0000 (02:11 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 25 Jul 2017 02:11:26 +0000 (02:11 +0000)
author Ajay Panicker <apanicke@google.com>
Tue, 25 Jul 2017 02:11:26 +0000 (02:11 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 25 Jul 2017 02:11:26 +0000 (02:11 +0000)
diff --cc core/java/com/android/internal/os/BatteryStatsImpl.java
Simple merge
author	Ajay Panicker <apanicke@google.com>
	Tue, 25 Jul 2017 02:11:26 +0000 (02:11 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 25 Jul 2017 02:11:26 +0000 (02:11 +0000)