Merge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev am: c872c14785

author Lei Yu <jackqdyulei@google.com>

Fri, 15 Sep 2017 21:46:59 +0000 (21:46 +0000)

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

Fri, 15 Sep 2017 21:46:59 +0000 (21:46 +0000)
author Lei Yu <jackqdyulei@google.com>
Fri, 15 Sep 2017 21:46:59 +0000 (21:46 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 15 Sep 2017 21:46:59 +0000 (21:46 +0000)
diff --cc src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java
Simple merge
diff --cc tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
Simple merge
author	Lei Yu <jackqdyulei@google.com>
	Fri, 15 Sep 2017 21:46:59 +0000 (21:46 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 15 Sep 2017 21:46:59 +0000 (21:46 +0000)
		1	2
src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java	patch \|	diff1 \|	diff2 \|	blob \| history
tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java	patch \|	diff1 \|	diff2 \|	blob \| history