am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"
am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"

* commit 'a9045d24a73faa6aa1e8ad204a1e14a53711a824':
  Add NULL check in updateProxyConfig

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base