Merge "Add Call Redirection Default Application in Settings" am: b7c0727c15 am: 93679...

author sqian <shuoq@google.com>

Tue, 9 Oct 2018 19:00:01 +0000 (12:00 -0700)

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

Tue, 9 Oct 2018 19:00:01 +0000 (12:00 -0700)
author sqian <shuoq@google.com>
Tue, 9 Oct 2018 19:00:01 +0000 (12:00 -0700)
committer android-build-merger <android-build-merger@google.com>
Tue, 9 Oct 2018 19:00:01 +0000 (12:00 -0700)
diff --cc core/java/android/provider/Settings.java
Simple merge
diff --cc core/tests/coretests/src/android/provider/SettingsBackupTest.java
Simple merge
author	sqian <shuoq@google.com>
	Tue, 9 Oct 2018 19:00:01 +0000 (12:00 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 9 Oct 2018 19:00:01 +0000 (12:00 -0700)
		1	2
core/java/android/provider/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/tests/coretests/src/android/provider/SettingsBackupTest.java	patch \|	diff1 \|	diff2 \|	blob \| history