OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ead8b50
5b9ceeb
)
am 5b9ceeba: am a4815c0e: am 9c9088a5: Merge "Move softap config handling to WifiConf...
author
Irfan Sheriff
<isheriff@google.com>
Thu, 19 May 2011 22:17:33 +0000
(15:17 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 19 May 2011 22:17:33 +0000
(15:17 -0700)
* commit '
5b9ceebafd36db4491a49c1f00750ce50c4d4433
':
Move softap config handling to WifiConfigStore
1
2
services/java/com/android/server/WifiService.java
patch
|
diff1
|
diff2
|
blob
|
history
wifi/java/android/net/wifi/WifiManager.java
patch
|
diff1
|
diff2
|
blob
|
history
wifi/java/android/net/wifi/WifiStateMachine.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/java/com/android/server/WifiService.java
Simple merge
diff --cc
wifi/java/android/net/wifi/WifiManager.java
Simple merge
diff --cc
wifi/java/android/net/wifi/WifiStateMachine.java
Simple merge