OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 472f6d1 f9c0f5a)
am a128f5f8: am 1a230885: Merge "Fix NPE when going from proxy to no proxy." into...
authorRobert Greenwalt <rgreenwalt@google.com>
Fri, 29 Jul 2011 17:55:58 +0000 (10:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 29 Jul 2011 17:55:58 +0000 (10:55 -0700)
* commit 'a128f5f8c952d7f519f64882792e832a4e75e2c8':
  Fix NPE when going from proxy to no proxy.


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