diff options
| author | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
| commit | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch) | |
| tree | 7784b988ef1698cb6967ea1bdf07616237716c6c /chrome/browser/sync/engine/net/url_translator.cc | |
| parent | efc8475837ec58186051f23bb03542620424f6ce (diff) | |
| download | external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.zip external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.gz external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.bz2 | |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
Diffstat (limited to 'chrome/browser/sync/engine/net/url_translator.cc')
| -rw-r--r-- | chrome/browser/sync/engine/net/url_translator.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/sync/engine/net/url_translator.cc b/chrome/browser/sync/engine/net/url_translator.cc index 6dc2754..4b91e54 100644 --- a/chrome/browser/sync/engine/net/url_translator.cc +++ b/chrome/browser/sync/engine/net/url_translator.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -8,7 +8,6 @@ #include "chrome/browser/sync/engine/net/url_translator.h" #include "base/basictypes.h" -#include "base/logging.h" #include "base/port.h" #include "net/base/escape.h" |