diff options
| author | Neil Fuller <nfuller@google.com> | 2018-11-28 08:10:04 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-28 08:10:04 -0800 |
| commit | 402dc485d0f8b8b11d6936f609e11fda856ab83d (patch) | |
| tree | e6ea987b7d1a679b5695a0dcc319105168a5274e /config/preloaded-classes | |
| parent | 9a827ab8c1bde5179df10f8d1065bc6a7ea6c60c (diff) | |
| parent | f79ecf7c82ba9b2815dd39920672866216b107e5 (diff) | |
Merge "Track move of timezone classes to libcore.timezone" am: d48dbc9a34
am: f79ecf7c82
Change-Id: I1551e5d4330ea290ba3e3054349f79ee28f919c6
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 9496c37c4396..495615b90b15 100644 --- a/config/preloaded-classes +++ b/config/preloaded-classes @@ -6163,6 +6163,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 @@ -6175,9 +6178,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 |