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:
eb26cd9
a4bbf55
)
am a4bbf553: am 3957b3c1: Merge "scan only when wifi is enabled" into froyo
author
Irfan Sheriff
<isheriff@google.com>
Sat, 10 Apr 2010 18:58:12 +0000
(11:58 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Sat, 10 Apr 2010 18:58:12 +0000
(11:58 -0700)
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