Merge "Revert "Add android.settings.ACTION_APP_BATTERY_SETTINGS to public API"" into...

author TreeHugger Robot <treehugger-gerrit@google.com>

Wed, 17 Apr 2019 22:16:24 +0000 (22:16 +0000)

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

Wed, 17 Apr 2019 22:16:24 +0000 (22:16 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Wed, 17 Apr 2019 22:16:24 +0000 (22:16 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 17 Apr 2019 22:16:24 +0000 (22:16 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/java/android/provider/Settings.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Wed, 17 Apr 2019 22:16:24 +0000 (22:16 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 17 Apr 2019 22:16:24 +0000 (22:16 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/provider/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history