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:
94a2db6
0449828
)
Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86
author
Chih-Wei Huang
<cwhuang@linux.org.tw>
Wed, 21 Sep 2016 05:30:56 +0000
(13:30 +0800)
committer
Chih-Wei Huang
<cwhuang@linux.org.tw>
Wed, 21 Sep 2016 05:30:56 +0000
(13:30 +0800)
1
2
src/com/android/settings/SettingsActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/users/UserSettings.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/SettingsActivity.java
Simple merge
diff --cc
src/com/android/settings/users/UserSettings.java
Simple merge
OSDN Git Service
