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:
9dffb28
e34375b
)
Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable"" am: 80c0656ca6
author
Jack He
<siyuanh@google.com>
Mon, 8 Jan 2018 20:20:47 +0000
(20:20 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 8 Jan 2018 20:20:47 +0000
(20:20 +0000)
am:
e34375b88c
Change-Id: Ie9a167aa6310643465238510831eee8cfab34965
1
2
res/values/strings.xml
patch
|
diff1
|
diff2
|
blob
|
history
res/xml/development_prefs.xml
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/development/DevelopmentSettings.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
res/values/strings.xml
Simple merge
diff --cc
res/xml/development_prefs.xml
Simple merge
diff --cc
src/com/android/settings/development/DevelopmentSettings.java
Simple merge
OSDN Git Service
