Merge "Hidden API blacklisting killswitch." am: 46656fa28e

author Mathew Inwood <mathewi@google.com>

Fri, 16 Feb 2018 16:39:59 +0000 (16:39 +0000)

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

Fri, 16 Feb 2018 16:39:59 +0000 (16:39 +0000)
author Mathew Inwood <mathewi@google.com>
Fri, 16 Feb 2018 16:39:59 +0000 (16:39 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 16 Feb 2018 16:39:59 +0000 (16:39 +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	Mathew Inwood <mathewi@google.com>
	Fri, 16 Feb 2018 16:39:59 +0000 (16:39 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 16 Feb 2018 16:39:59 +0000 (16:39 +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