OSDN Git Service

Merge "Fix uri permission grant on remote bug report uri" into nyc-dev
authorRubin Xu <rubinxu@google.com>
Fri, 10 Feb 2017 12:16:19 +0000 (12:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 Feb 2017 12:16:19 +0000 (12:16 +0000)
commit824c8284ce3734ae7b37bcad5b4251861d94f27b
treed81bc7c3ffe2ee9f4e14ecc79b34ffa0d9d27d1a
parent78f2e38a12fc313fd055af542ab524d4a523010b
parent42f2e8029369639868eb2082e8681cee5f3b1849
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev
am: 42f2e80293

Change-Id: Ic167e10a205b5c8f9df81cd20a6f08359d3807f4
core/java/android/app/admin/DevicePolicyManager.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java