Merge "Fix uri permission grant on remote bug report uri" into nyc-dev

author Rubin Xu <rubinxu@google.com>

Fri, 10 Feb 2017 12:16:19 +0000 (12:16 +0000)

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

Fri, 10 Feb 2017 12:16:19 +0000 (12:16 +0000)
author Rubin Xu <rubinxu@google.com>
Fri, 10 Feb 2017 12:16:19 +0000 (12:16 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 10 Feb 2017 12:16:19 +0000 (12:16 +0000)
diff --cc core/java/android/app/admin/DevicePolicyManager.java
Simple merge
diff --cc services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
Simple merge
author	Rubin Xu <rubinxu@google.com>
	Fri, 10 Feb 2017 12:16:19 +0000 (12:16 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 10 Feb 2017 12:16:19 +0000 (12:16 +0000)
		1	2
core/java/android/app/admin/DevicePolicyManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history