OSDN Git Service

am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"
authorMarco Nelissen <marcone@google.com>
Tue, 14 Jan 2014 16:18:02 +0000 (16:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 14 Jan 2014 16:18:02 +0000 (16:18 +0000)
commite2c046fe7c5eefb49f710bc417d54448c133cc93
treec01fc9cf86a686297e3727c6ae979677c2eea1e6
parentd34950cfc66e258caba14c7ddc553028647898f1
parent13249411b1c7dd4a476eec6905998217636a9344
am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"

* commit '13249411b1c7dd4a476eec6905998217636a9344':
  Add NULL check in updateProxyConfig