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:
0dfa7b5
3aac3eb
)
resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev am: eb35ad9969
author
Andrew Scull
<ascull@google.com>
Fri, 13 Jan 2017 21:16:31 +0000
(21:16 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 13 Jan 2017 21:16:31 +0000
(21:16 +0000)
am:
3aac3ebee1
Change-Id: Id7be6d9656b292ec1bf526750db8081022267c4a
1
2
core/java/android/app/admin/DevicePolicyManager.java
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/app/admin/IDevicePolicyManager.aidl
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
core/java/android/app/admin/IDevicePolicyManager.aidl
Simple merge
diff --cc
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
Simple merge