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:
d7fd045
0b7dd1e
)
Merge "Allowing profile to set a subset of keyguard restrictions." into mnc-dev
author
Kenny Guy
<kennyguy@google.com>
Wed, 13 May 2015 21:07:15 +0000
(21:07 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 13 May 2015 21:07:17 +0000
(21:07 +0000)
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
OSDN Git Service
