Merge "Fix issue #77721907: Add global setting to hide all error dialogs" into pi-dev

author Dianne Hackborn <hackbod@google.com>

Tue, 10 Apr 2018 06:24:50 +0000 (06:24 +0000)

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

Tue, 10 Apr 2018 06:24:50 +0000 (06:24 +0000)
author Dianne Hackborn <hackbod@google.com>
Tue, 10 Apr 2018 06:24:50 +0000 (06:24 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 10 Apr 2018 06:24:50 +0000 (06:24 +0000)
diff --cc core/java/android/provider/Settings.java
Simple merge
diff --cc core/tests/coretests/src/android/provider/SettingsBackupTest.java
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Tue, 10 Apr 2018 06:24:50 +0000 (06:24 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 10 Apr 2018 06:24:50 +0000 (06:24 +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
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history