| commit | a9045d24a73faa6aa1e8ad204a1e14a53711a824 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Tue Jan 14 08:11:39 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 14 08:11:39 2014 -0800 |
| tree | e8661142a3b9ce5d4fda4f0f60cbb9374489f6ce | |
| parent | 2db26788ab367f08cb5378d77e22e8939e7a28c2 [diff] | |
| parent | 337aa376c09bb97a48afe075b4018f030445534f [diff] |
am 337aa376: Merge "Add NULL check in updateProxyConfig" * commit '337aa376c09bb97a48afe075b4018f030445534f': Add NULL check in updateProxyConfig