Merge "Add setupwizard personalisation state to Settings" into pi-dev

author Ajay Nadathur <ajayns@google.com>

Tue, 20 Mar 2018 00:07:13 +0000 (00:07 +0000)

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

Tue, 20 Mar 2018 00:07:13 +0000 (00:07 +0000)
author Ajay Nadathur <ajayns@google.com>
Tue, 20 Mar 2018 00:07:13 +0000 (00:07 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 20 Mar 2018 00:07:13 +0000 (00:07 +0000)
diff --cc core/java/android/provider/Settings.java
Simple merge
diff --cc core/tests/coretests/src/android/provider/SettingsBackupTest.java
Simple merge
author	Ajay Nadathur <ajayns@google.com>
	Tue, 20 Mar 2018 00:07:13 +0000 (00:07 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 20 Mar 2018 00:07:13 +0000 (00:07 +0000)
		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