Merge "Use shorter string for MasterClear to stop truncating title" into pi-dev am...

author Fan Zhang <zhfan@google.com>

Fri, 11 May 2018 00:44:42 +0000 (17:44 -0700)

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

Fri, 11 May 2018 00:44:42 +0000 (17:44 -0700)
author Fan Zhang <zhfan@google.com>
Fri, 11 May 2018 00:44:42 +0000 (17:44 -0700)
committer android-build-merger <android-build-merger@google.com>
Fri, 11 May 2018 00:44:42 +0000 (17:44 -0700)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/MasterClear.java
Simple merge
author	Fan Zhang <zhfan@google.com>
	Fri, 11 May 2018 00:44:42 +0000 (17:44 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 11 May 2018 00:44:42 +0000 (17:44 -0700)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/MasterClear.java	patch \|	diff1 \|	diff2 \|	blob \| history