tree a33c6799787c0a803dae10af2255949a9872570f
parent e33e2ca3460c0e5a898e5b0406d86b16b96f735a
parent f8a0c47e9091d7a14e05dedc65b49af09fdc8fb8
author Andreas Huber <andih@google.com> 1391706630 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1391706631 +0000

Merge "Remove no longer needed http proxy handling code, it's obsolete now"