commit | 366f592b24e7eed6d8f10b4a68d8f0dca4f3dddf | [log] [tgz] |
---|---|---|
author | Selim Gurun <sgurun@google.com> | Mon Dec 15 18:08:31 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Dec 15 18:08:33 2014 +0000 |
tree | 27845967dcee2ba9174c684dab2f3ab26ce4f2bb | |
parent | 1b000d84481a57463a1ab843eda1cb110af822f1 [diff] | |
parent | 2705cc61d945662005e7001290cd0572ed2e8a0e [diff] |
Merge "do not send traffic to localhost through proxy for android" into m39