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:
82c039b
9f629d6
)
Merge "Add ability to switch between support versions"
author
Andrew Sapperstein
<asapperstein@google.com>
Mon, 1 May 2017 22:37:28 +0000
(22:37 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Mon, 1 May 2017 22:37:32 +0000
(22:37 +0000)
1
2
AndroidManifest.xml
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/Settings.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/core/gateway/SettingsGateway.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
AndroidManifest.xml
Simple merge
diff --cc
src/com/android/settings/Settings.java
Simple merge
diff --cc
src/com/android/settings/core/gateway/SettingsGateway.java
Simple merge