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:
2cfbca4
2169505
)
Merge tag 'android-6.0.1_r66' into marshmallow-x86
android-x86-6.0-r1
author
Chih-Wei Huang
<cwhuang@linux.org.tw>
Wed, 7 Sep 2016 05:55:35 +0000
(13:55 +0800)
committer
Chih-Wei Huang
<cwhuang@linux.org.tw>
Wed, 7 Sep 2016 05:55:35 +0000
(13:55 +0800)
Android 6.0.1 release 66
1
2
src/com/android/settings/SettingsActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/SettingsActivity.java
Simple merge