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