diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 18:59:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 18:59:43 +0000 |
| commit | 83d01084b9c729b9f1aece3ef225a60e2bd752fa (patch) | |
| tree | 840924da66a82b6a7dbeb66fe6a58f37a9f9b64f /ojluni/annotations/hiddenapi/java/util/TimerTask.java | |
| parent | 3b87c238dfdfff06ab11a3e980ed7dd9900346f9 (diff) | |
| parent | 4ecb654da9d12815652417c771caab8420040e11 (diff) | |
Merge "Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours" into oreo-mr1-cts-dev am: 7c2d068af6 -s ours am: 4ecb654da9 -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: Ie3ea78161dfd8063abd0bae61d77beaea11cdf24
Diffstat (limited to 'ojluni/annotations/hiddenapi/java/util/TimerTask.java')
0 files changed, 0 insertions, 0 deletions