OSDN Git Service

am 337aa376: Merge "Add NULL check in updateProxyConfig"
authorMarco Nelissen <marcone@google.com>
Tue, 14 Jan 2014 16:11:39 +0000 (08:11 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jan 2014 16:11:39 +0000 (08:11 -0800)
commita9045d24a73faa6aa1e8ad204a1e14a53711a824
treee8661142a3b9ce5d4fda4f0f60cbb9374489f6ce
parent2db26788ab367f08cb5378d77e22e8939e7a28c2
parent337aa376c09bb97a48afe075b4018f030445534f
am 337aa376: Merge "Add NULL check in updateProxyConfig"

* commit '337aa376c09bb97a48afe075b4018f030445534f':
  Add NULL check in updateProxyConfig