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:
cee6570
bd4148b
)
Merge "setProfileEnabled should be no-op when the profile is already enabled"
author
Tony Mak
<tonymak@google.com>
Tue, 28 Jun 2016 11:11:26 +0000
(11:11 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 28 Jun 2016 11:11:28 +0000
(11:11 +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