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:
e9a3a14
e837771
)
Merge "Introduce boolean flag to show/hide Location Scanning preference."
author
TreeHugger Robot
<treehugger-gerrit@google.com>
Fri, 12 Jan 2018 21:53:12 +0000
(21:53 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 12 Jan 2018 21:53:12 +0000
(21:53 +0000)
1
2
res/values/bools.xml
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/location/LocationSettings.java
patch
|
diff1
|
diff2
|
blob
|
history
tests/robotests/res/values-mcc999/config.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
res/values/bools.xml
Simple merge
diff --cc
src/com/android/settings/location/LocationSettings.java
Simple merge
diff --cc
tests/robotests/res/values-mcc999/config.xml
Simple merge