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:
759e1c5
c7b1834
)
Don't check device_provisioned on Wear devices in setDeviceOwnerSystemPropertyLocked()
author
Greg Plesur
<plesur@google.com>
Wed, 8 Feb 2017 23:44:13 +0000
(23:44 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 8 Feb 2017 23:44:13 +0000
(23:44 +0000)
am:
c7b18342ea
Change-Id: I692fee4165de9a274d8eb8f0deaf49762974bb22
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