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:
b1c0a25
26fccb7
)
Merge "Throw if admin sets password constraints that have no effect."
author
Pavel Grafov
<pgrafov@google.com>
Thu, 26 Sep 2019 10:55:54 +0000
(10:55 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 26 Sep 2019 10:55:54 +0000
(10:55 +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