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:
a5db0b9
2df5919
)
Merge "[DPM] Allow lower strong auth timeout on debuggable builds"
author
TreeHugger Robot
<treehugger-gerrit@google.com>
Thu, 12 Jan 2017 13:46:05 +0000
(13:46 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 12 Jan 2017 13:46:09 +0000
(13:46 +0000)
1
2
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
Simple merge
OSDN Git Service
