Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2c07a66 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Track move of timezone classes to libcore.timezone" am: 247ef871 

am: 3d2218b1

Change-Id: If4ddd35fed0d79d5fafc4a39eeaf6877e70f5c4d
parents f7eee6b0 3d2218b1

src/java/com/android/internal/telephony/MccTable.java

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import com.android.internal.app.LocaleStore; 
import com.android.internal.app.LocaleStore.LocaleInfo;



import libcore.icu.ICU;

import libcore.util.TimeZoneFinder;

import libcore.timezone.TimeZoneFinder;



import java.util.ArrayList;

import java.util.Arrays;

src/java/com/android/internal/telephony/TimeZoneLookupHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ package com.android.internal.telephony; 


import android.text.TextUtils;



import libcore.util.CountryTimeZones;

import libcore.util.TimeZoneFinder;

import libcore.timezone.CountryTimeZones;

import libcore.timezone.TimeZoneFinder;



import java.util.Date;

import java.util.TimeZone;

tests/telephonytests/src/com/android/internal/telephony/TimeZoneLookupHelperTest.java

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertFalse; 
import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;



import libcore.util.TimeZoneFinder;

import libcore.timezone.TimeZoneFinder;



import org.junit.Before;

import org.junit.Test;