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