Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev

author Kevin Chyn <kchyn@google.com>

Mon, 18 Jun 2018 12:49:12 +0000 (05:49 -0700)

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

Mon, 18 Jun 2018 12:49:12 +0000 (05:49 -0700)
author Kevin Chyn <kchyn@google.com>
Mon, 18 Jun 2018 12:49:12 +0000 (05:49 -0700)
committer android-build-merger <android-build-merger@google.com>
Mon, 18 Jun 2018 12:49:12 +0000 (05:49 -0700)
diff --cc core/java/android/provider/Settings.java
Simple merge
diff --cc core/tests/coretests/src/android/provider/SettingsBackupTest.java
Simple merge
author	Kevin Chyn <kchyn@google.com>
	Mon, 18 Jun 2018 12:49:12 +0000 (05:49 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 18 Jun 2018 12:49:12 +0000 (05:49 -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