OSDN Git Service

Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293...
authorRubin Xu <rubinxu@google.com>
Fri, 10 Feb 2017 12:32:48 +0000 (12:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 Feb 2017 12:32:48 +0000 (12:32 +0000)
commit6ee5a0c8a5a79e4087b51b85a5af5cc1dee116a1
treec898a439a97c2c302a8a68557b484d870095fdf3
parent186c0839d826e47167b12b3df9b35665fa15c836
parent060cde9802d0e39e428799b0603a2c1ee0075f58
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce am: 72074e3ab9 am: f85a20702a
am: 060cde9802

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