OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
78f2e38
42f2e80
)
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)
am:
42f2e80293
Change-Id: Ic167e10a205b5c8f9df81cd20a6f08359d3807f4
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
diff --cc
core/java/android/app/admin/DevicePolicyManager.java
Simple merge
diff --cc
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
Simple merge