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:
1fbb5da
4c514f2
)
am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" into klp-dev
author
Robert Greenwalt
<rgreenwalt@google.com>
Thu, 14 Nov 2013 00:29:12 +0000
(16:29 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 14 Nov 2013 00:29:12 +0000
(16:29 -0800)
* commit '
4c514f2a688bdae319c919987092ccfee690f390
':
Fix for the invalid Global Proxy Setting
1
2
services/java/com/android/server/ConnectivityService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/java/com/android/server/ConnectivityService.java
Simple merge
OSDN Git Service
