diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 23:31:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 23:31:48 +0000 |
| commit | 6543d6ed08e175d766455ac5944dd69867b93a2b (patch) | |
| tree | c648766da6552f956556c471d5a269c9b64d5825 /ojluni/annotations/hiddenapi/java/util/TimerTask.java | |
| parent | 68f384c7263859d79f0e11f74bc711b4a5655b7f (diff) | |
| parent | 2aeac88223ca47df24d6c27c43256e345768e6ce (diff) | |
[automerger skipped] Merge "Merge "Track tzdb 2020a changes [N CTS branch]" into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -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/+/1317311
Change-Id: I77870cd872aa20dfe570671ca6583336db013cc5
Diffstat (limited to 'ojluni/annotations/hiddenapi/java/util/TimerTask.java')
0 files changed, 0 insertions, 0 deletions