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:
e9d50cd
ad85d6b
)
Merge "Remove developer option to disable device ID access restrictions" into qt-dev
author
Michael Groover
<mpgroover@google.com>
Wed, 12 Jun 2019 21:20:33 +0000
(14:20 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 12 Jun 2019 21:20:33 +0000
(14:20 -0700)
am:
ad85d6b942
Change-Id: Ie49e2845fe5c3389b9a44803e293789971ecb485
1
2
res/values/strings.xml
patch
|
diff1
|
diff2
|
blob
|
history
res/xml/development_settings.xml
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
res/values/strings.xml
Simple merge
diff --cc
res/xml/development_settings.xml
Simple merge
diff --cc
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
Simple merge