Merge "Add optional reasons why permissions were denied" into qt-dev

author TreeHugger Robot <treehugger-gerrit@google.com>

Mon, 6 May 2019 06:21:23 +0000 (06:21 +0000)

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

Mon, 6 May 2019 06:21:23 +0000 (06:21 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Mon, 6 May 2019 06:21:23 +0000 (06:21 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 6 May 2019 06:21:23 +0000 (06:21 +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/pm/PackageManagerService.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Mon, 6 May 2019 06:21:23 +0000 (06:21 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 6 May 2019 06:21:23 +0000 (06:21 +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/pm/PackageManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history