tree a55d227eb9888e9f63d65029e1437e01fd96ce6d
parent b4c13c4b045f4d96c377ba1fb9d834c111412a8c
parent 00e8d4c1b69997f63542cff5698c358d494a8d9f
author Robert Greenwalt <rgreenwalt@google.com> 1365531306 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1365531306 +0000

Merge "Turn back on global proxy support." into jb-mr2-dev