OSDN Git Service
(root)
/
android-x86
/
system-netd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8cee784
2446b68
)
am 2446b68f: Merge "Fix the DNS proxy again, for reals."
author
Brad Fitzpatrick
<bradfitz@android.com>
Wed, 26 Jan 2011 00:21:25 +0000
(16:21 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 26 Jan 2011 00:21:25 +0000
(16:21 -0800)
* commit '
2446b68f8c0d72972f8f6ec7fa972d05a29c9f02
':
Fix the DNS proxy again, for reals.
Trivial merge