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:
b2af26d
704476a
)
Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev...
author
Wei Wang
<weiwa@google.com>
Thu, 2 Jun 2016 17:25:41 +0000
(17:25 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 2 Jun 2016 17:25:41 +0000
(17:25 +0000)
am:
704476a96d
* commit '
704476a96d5363679ddcb6d311bb6ca7c4a5faae
':
Revert "Add an entry in developer options for location tools."
Change-Id: I3ed38b246d4f9aa64daa1c432d8f0b5020515e5a
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/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/DevelopmentSettings.java
Simple merge
OSDN Git Service
