diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-30 18:14:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 18:14:31 +0000 |
commit | 71fc6b75a34a5e9b485550b84edd5f17cd32b170 (patch) | |
tree | c648766da6552f956556c471d5a269c9b64d5825 /ojluni/annotations/hiddenapi/java/util/TimerTask.java | |
parent | 6543d6ed08e175d766455ac5944dd69867b93a2b (diff) | |
parent | 9a5b1ba7f7c4d7e4a9daa136e84eb5a6daed0261 (diff) |
[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours
am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 054315bd8e is in history
Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271
Change-Id: I84426b1bbcf5eb3af0eb7f3f4178a37cc8646366
Diffstat (limited to 'ojluni/annotations/hiddenapi/java/util/TimerTask.java')
0 files changed, 0 insertions, 0 deletions