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:
1522839
879fd4b
)
Merge "Cleanup unused WifiP2pSettings code in WifiSettings" am: cd1f7a3146 am: 27ca1272a5
author
Shinji Sogo
<shinji.sogo@sonymobile.com>
Fri, 16 Jun 2017 19:06:38 +0000
(19:06 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 16 Jun 2017 19:06:38 +0000
(19:06 +0000)
am:
879fd4b406
Change-Id: Ie7b7de6ab3e9d8ebf13beffffd0ca0aa4026e8ea
1
2
src/com/android/settings/wifi/WifiSettings.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/wifi/WifiSettings.java
Simple merge