| commit | e2c046fe7c5eefb49f710bc417d54448c133cc93 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Jan 14 16:18:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 14 16:18:02 2014 +0000 |
| tree | c01fc9cf86a686297e3727c6ae979677c2eea1e6 | |
| parent | d34950cfc66e258caba14c7ddc553028647898f1 [diff] | |
| parent | 13249411b1c7dd4a476eec6905998217636a9344 [diff] |
am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig" * commit '13249411b1c7dd4a476eec6905998217636a9344': Add NULL check in updateProxyConfig