diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-02 15:22:58 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-14 20:31:44 -0700 |
| commit | ee7d9dfef7bc481d20ed0fe1e6f382495b25e2a7 (patch) | |
| tree | cd3dedb437e55d6463fa2ad1609f61f3cf8e5c4c /android | |
| parent | ba0781264f9aff2d67c64f616963d059eae31684 (diff) | |
| download | external_chromium-ee7d9dfef7bc481d20ed0fe1e6f382495b25e2a7.zip external_chromium-ee7d9dfef7bc481d20ed0fe1e6f382495b25e2a7.tar.gz external_chromium-ee7d9dfef7bc481d20ed0fe1e6f382495b25e2a7.tar.bz2 | |
Merge Chromium at r11.0.672.0: Files moved upstream
Files moved upstream, didn't find a good codereview, but this will do:
http://src.chromium.org/viewvc/chrome/trunk/src/ui/base/l10n/l10n_util.h?view=log&pathrev=74924#rev72227
Change-Id: I0267206e0fcfc5bb05235c2a4e64c8fc00d2f9a3
Diffstat (limited to 'android')
| -rw-r--r-- | android/ui/base/l10n/l10n_util.cc (renamed from android/app/l10n_util.cc) | 2 | ||||
| -rw-r--r-- | android/ui/base/l10n/l10n_util.h (renamed from android/app/l10n_util.h) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/android/app/l10n_util.cc b/android/ui/base/l10n/l10n_util.cc index c9b17bf..649b86e 100644 --- a/android/app/l10n_util.cc +++ b/android/ui/base/l10n/l10n_util.cc @@ -23,7 +23,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "android/app/l10n_util.h" +#include "ui/base/l10n/l10n_util.h" #include "base/logging.h" #include "base/string_util.h" diff --git a/android/app/l10n_util.h b/android/ui/base/l10n/l10n_util.h index 2270bf6..2270bf6 100644 --- a/android/app/l10n_util.h +++ b/android/ui/base/l10n/l10n_util.h |