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:
cd6a485
1f1ceef
)
Merge "Ignore unknown user restrictions and WTF instead."
author
Makoto Onuki
<omakoto@google.com>
Wed, 3 Feb 2016 01:38:33 +0000
(
01:38
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 3 Feb 2016 01:38:33 +0000
(
01:38
+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
