tree 86badb182d059adc041426f58d3b5297dbaa8f8f
parent 48eded0e8fdf594cb53c4137c7cc62d90af87f97
parent 3d66658106600473851b8b868b20b8c11fad8c7d
author Robert Greenwalt <rgreenwalt@google.com> 1384388876 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384388876 -0800

am 3d666581: Merge "Fix for the invalid Global Proxy Setting"

* commit '3d66658106600473851b8b868b20b8c11fad8c7d':
  Fix for the invalid Global Proxy Setting