Merge "Package wakeup alarms are now on screen-off timebase" into oc-mr1-dev am:...

author Adam Bookatz <bookatz@google.com>

Mon, 7 Aug 2017 23:42:05 +0000 (23:42 +0000)

committer android-build-merger <android-build-merger@google.com>

Mon, 7 Aug 2017 23:42:05 +0000 (23:42 +0000)
author Adam Bookatz <bookatz@google.com>
Mon, 7 Aug 2017 23:42:05 +0000 (23:42 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 7 Aug 2017 23:42:05 +0000 (23:42 +0000)
diff --cc core/java/android/os/BatteryStats.java
Simple merge
diff --cc core/java/com/android/internal/os/BatteryStatsImpl.java
Simple merge
author	Adam Bookatz <bookatz@google.com>
	Mon, 7 Aug 2017 23:42:05 +0000 (23:42 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 7 Aug 2017 23:42:05 +0000 (23:42 +0000)
		1	2
core/java/android/os/BatteryStats.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/com/android/internal/os/BatteryStatsImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history