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:
331a4bb
eb35ad9
)
resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev
author
Andrew Scull
<ascull@google.com>
Fri, 13 Jan 2017 17:17:49 +0000
(17:17 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 13 Jan 2017 17:17:49 +0000
(17:17 +0000)
am:
eb35ad9969
Change-Id: I4fd9ce4c79db5a10f28008c89205fc9c8ef2888f
1
2
services/core/java/com/android/server/LockSettingsService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/LockSettingsService.java
Simple merge
diff --cc
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
Simple merge
OSDN Git Service
