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:
c82aa9a
5c43d4e
)
am 5c43d4e4: Merge "Return detailed reason of invalid proxy settings"
author
Yuhao Zheng
<yuhaozheng@google.com>
Tue, 4 Mar 2014 17:45:48 +0000
(09:45 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 4 Mar 2014 17:45:48 +0000
(09:45 -0800)
* commit '
5c43d4e451a1480d82014a1e1c403a5c764e758c
':
Return detailed reason of invalid proxy settings
Trivial merge