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:
8596f69
df35d57
)
Merge "Adds an enabled state in UserInfo instead of DevicePolicyManager"
author
Alexandra Gherghina
<alexgherghina@google.com>
Thu, 1 May 2014 10:49:21 +0000
(10:49 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 1 May 2014 10:49:21 +0000
(10:49 +0000)
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
OSDN Git Service
