diff options
| author | Neil Fuller <nfuller@google.com> | 2015-04-07 12:54:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-07 12:54:41 +0000 |
| commit | 345d118df6eef599a1ad0ea18022ad1f74633f10 (patch) | |
| tree | 9c43cd67897f7354fc9d416b0d522a5fbf6d47e7 /luni/src/main/java | |
| parent | e25881196b4cb5f056619bf2883b10bb861dd704 (diff) | |
| parent | 317d6e12782e069e4fde06ed0f9a976a7c49f580 (diff) | |
| download | libcore-345d118df6eef599a1ad0ea18022ad1f74633f10.zip libcore-345d118df6eef599a1ad0ea18022ad1f74633f10.tar.gz libcore-345d118df6eef599a1ad0ea18022ad1f74633f10.tar.bz2 | |
Merge "Changes to enable timezone data overrides for ICU and libcore"
Diffstat (limited to 'luni/src/main/java')
| -rw-r--r-- | luni/src/main/java/libcore/util/ZoneInfoDB.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/luni/src/main/java/libcore/util/ZoneInfoDB.java b/luni/src/main/java/libcore/util/ZoneInfoDB.java index 906ec14..b8e1dad 100644 --- a/luni/src/main/java/libcore/util/ZoneInfoDB.java +++ b/luni/src/main/java/libcore/util/ZoneInfoDB.java @@ -41,7 +41,8 @@ import libcore.io.MemoryMappedFile; */ public final class ZoneInfoDB { private static final TzData DATA = - new TzData(System.getenv("ANDROID_ROOT") + "/usr/share/zoneinfo/tzdata"); + new TzData(System.getenv("ANDROID_DATA") + "/misc/zoneinfo/current/tzdata", + System.getenv("ANDROID_ROOT") + "/usr/share/zoneinfo/tzdata"); public static class TzData { /** |