diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-24 19:54:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-24 19:54:46 -0700 |
| commit | 96f37d6d1b390f6690858789706ee6ec25bc1677 (patch) | |
| tree | 13393a450364cc7151435e2e995923272e3c0a0e /Tools/Scripts | |
| parent | d1a57b82be498d8398b69bf1d4950fe7edd59327 (diff) | |
| parent | 891974e8053115e15fdcf669bd052cbaaf372003 (diff) | |
| download | external_webkit-96f37d6d1b390f6690858789706ee6ec25bc1677.zip external_webkit-96f37d6d1b390f6690858789706ee6ec25bc1677.tar.gz external_webkit-96f37d6d1b390f6690858789706ee6ec25bc1677.tar.bz2 | |
am 891974e8: (-s ours) am 19d88459: am f18b71fe: Merge "Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE" into honeycomb-mr2
* commit '891974e8053115e15fdcf669bd052cbaaf372003':
Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
Diffstat (limited to 'Tools/Scripts')
0 files changed, 0 insertions, 0 deletions