OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 174b935 178ff3d)
am 676f7052: am 0a08b194: Merge "Fix HttpProxy." into froyo
authorRobert Greenwalt <robdroid@android.com>
Wed, 31 Mar 2010 15:37:45 +0000 (08:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 31 Mar 2010 15:37:45 +0000 (08:37 -0700)
Merge commit '676f70527d9f576f6e8b9e47e0aa7ac145fa81c2' into kraken

* commit '676f70527d9f576f6e8b9e47e0aa7ac145fa81c2':
  Fix HttpProxy.


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help