Merge "Adding new strings for battery saver sticky off notification."

author Kweku Adams <kwekua@google.com>

Sat, 23 Mar 2019 03:48:52 +0000 (03:48 +0000)

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

Sat, 23 Mar 2019 03:48:52 +0000 (03:48 +0000)
author Kweku Adams <kwekua@google.com>
Sat, 23 Mar 2019 03:48:52 +0000 (03:48 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 23 Mar 2019 03:48:52 +0000 (03:48 +0000)
diff --cc core/res/res/values/strings.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
diff --cc services/core/java/com/android/server/power/batterysaver/BatterySaverStateMachine.java
Simple merge
author	Kweku Adams <kwekua@google.com>
	Sat, 23 Mar 2019 03:48:52 +0000 (03:48 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 23 Mar 2019 03:48:52 +0000 (03:48 +0000)
		1	2
core/res/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/power/batterysaver/BatterySaverStateMachine.java	patch \|	diff1 \|	diff2 \|	blob \| history