Merge changes I85ca2b69,Ibd7a47cb,I79522aab

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

Fri, 15 Mar 2019 21:36:41 +0000 (21:36 +0000)

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

Fri, 15 Mar 2019 21:36:41 +0000 (21:36 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Fri, 15 Mar 2019 21:36:41 +0000 (21:36 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 15 Mar 2019 21:36:41 +0000 (21:36 +0000)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/location/RecentLocationAccessPreferenceController.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Fri, 15 Mar 2019 21:36:41 +0000 (21:36 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 15 Mar 2019 21:36:41 +0000 (21:36 +0000)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/location/RecentLocationAccessPreferenceController.java	patch \|	diff1 \|	diff2 \|	blob \| history