summaryrefslogtreecommitdiffstats
path: root/content/zygote
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-07 22:33:47 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-07 22:33:47 +0000
commitc297d3a13ae36bf2f574e55b3f1f9494b3f98e7b (patch)
tree6d4bcd167b01ccf9fe91dd4e8b5c4d5d44124982 /content/zygote
parent47d20da2c60b132ba2cd3b94f9be9c38fc609ad2 (diff)
downloadchromium_src-c297d3a13ae36bf2f574e55b3f1f9494b3f98e7b.zip
chromium_src-c297d3a13ae36bf2f574e55b3f1f9494b3f98e7b.tar.gz
chromium_src-c297d3a13ae36bf2f574e55b3f1f9494b3f98e7b.tar.bz2
Roll ICU and convert include style to standard Chromium style,
i.e. third_party/... BUG=165264 Review URL: https://codereview.chromium.org/11734021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/zygote')
-rw-r--r--content/zygote/zygote_main_linux.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc
index d8f2ed9..d0f8647 100644
--- a/content/zygote/zygote_main_linux.cc
+++ b/content/zygote/zygote_main_linux.cc
@@ -38,7 +38,7 @@
#include "sandbox/linux/services/libc_urandom_override.h"
#include "sandbox/linux/suid/client/setuid_sandbox_client.h"
#include "skia/ext/SkFontHost_fontconfig_control.h"
-#include "unicode/timezone.h"
+#include "third_party/icu/public/i18n/unicode/timezone.h"
#if defined(OS_LINUX)
#include <sys/epoll.h>