OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c84ccbf
9c32468
)
Merge "Add padlocks to more preferences that can be disabled by policy."
author
Sudheer Shanka
<sudheersai@google.com>
Tue, 19 Jan 2016 17:58:27 +0000
(17:58 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 19 Jan 2016 17:58:27 +0000
(17:58 +0000)
1
2
src/com/android/settings/ChooseLockGeneric.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/accessibility/AccessibilitySettings.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/ChooseLockGeneric.java
Simple merge
diff --cc
src/com/android/settings/accessibility/AccessibilitySettings.java
Simple merge