summaryrefslogtreecommitdiffstats
path: root/build/linux/.svn/text-base/pkg-config-wrapper.svn-base
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-05-24 19:54:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-24 19:54:44 -0700
commite23bef148f7be2bdf9c3cb2cd3aa5ceebf1190fb (patch)
tree404fc461f6c687c2ed1453aae5dcf8b05400915a /build/linux/.svn/text-base/pkg-config-wrapper.svn-base
parent12ce095c849adc91534e1cde73d42fddd1b72570 (diff)
parent337420a80173c5dcbefc0c133bd04bc9cc86b29a (diff)
downloadexternal_chromium-e23bef148f7be2bdf9c3cb2cd3aa5ceebf1190fb.zip
external_chromium-e23bef148f7be2bdf9c3cb2cd3aa5ceebf1190fb.tar.gz
external_chromium-e23bef148f7be2bdf9c3cb2cd3aa5ceebf1190fb.tar.bz2
am 337420a8: (-s ours) am e5ee1dd1: Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn\'t bypass proxy DO NOT MERGE
* commit '337420a80173c5dcbefc0c133bd04bc9cc86b29a': Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy DO NOT MERGE
Diffstat (limited to 'build/linux/.svn/text-base/pkg-config-wrapper.svn-base')
0 files changed, 0 insertions, 0 deletions