tree 4c93ce8f1e59ce24437427e02c2fc38f5af69ae3
parent b07de8d172e7c7b663dec0dd14f7d6dba168aa4c
parent 2122e14cca3edc5099b90d8768b34d7a0e9fe148
author Paul Jensen <pauljensen@google.com> 1418273752 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418273752 +0000

am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-dev

* commit '2122e14cca3edc5099b90d8768b34d7a0e9fe148':
  Fix several HTTP proxy issues with multinetworking.