diff options
| author | Neil Fuller <nfuller@google.com> | 2018-11-28 08:24:57 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-28 08:24:57 -0800 |
| commit | f148c8d7d48d06ebea881199a3bebac93a062f31 (patch) | |
| tree | 2d2f2a81b48b7f2bfbb8f067cd77582d0ad36e1f /config/preloaded-classes | |
| parent | 6cb11aeb4adbd42e5af31de063dc6822b81087fb (diff) | |
| parent | 402dc485d0f8b8b11d6936f609e11fda856ab83d (diff) | |
Merge "Track move of timezone classes to libcore.timezone" am: d48dbc9a34 am: f79ecf7c82
am: 402dc485d0
Change-Id: If9c8cfdce9bd0b3bcd460216edca369fd75abdde
Diffstat (limited to 'config/preloaded-classes')
| -rw-r--r-- | config/preloaded-classes | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/preloaded-classes b/config/preloaded-classes index 550e795bd1e6..5940c45466fb 100644 --- a/config/preloaded-classes +++ b/config/preloaded-classes @@ -6172,6 +6172,9 @@ libcore.reflect.TypeVariableImpl libcore.reflect.Types libcore.reflect.WildcardTypeImpl libcore.timezone.TimeZoneDataFiles +libcore.timezone.ZoneInfoDB +libcore.timezone.ZoneInfoDB$TzData +libcore.timezone.ZoneInfoDB$TzData$1 libcore.util.BasicLruCache libcore.util.CharsetUtils libcore.util.CollectionUtils @@ -6184,9 +6187,6 @@ libcore.util.SneakyThrow libcore.util.ZoneInfo libcore.util.ZoneInfo$CheckedArithmeticException libcore.util.ZoneInfo$WallTime -libcore.util.ZoneInfoDB -libcore.util.ZoneInfoDB$TzData -libcore.util.ZoneInfoDB$TzData$1 org.apache.harmony.dalvik.NativeTestTarget org.apache.harmony.dalvik.ddmc.Chunk org.apache.harmony.dalvik.ddmc.ChunkHandler |