diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-26 00:29:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-26 00:29:07 +0000 |
| commit | c68b65f522868efec45dc19296f51f5e8d777b12 (patch) | |
| tree | f2a06f5d94278abe39fcb6eb95caa2a7c0c2a88b /ojluni/annotations/hiddenapi/java/util/TimerTask.java | |
| parent | 4174ffabf2978e0aceea5860edfd8f9cb641ea0c (diff) | |
| parent | 3b87c238dfdfff06ab11a3e980ed7dd9900346f9 (diff) | |
Merge "[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" into oreo-cts-dev am: 055b92daef -s ours am: c38f4c5a7a -s ours am: c96bc20189 -s ours am: a3107e916d -s ours am: 3b87c238df -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: Iac82792aa3cc4fe795d5a05a22c7a6a495a0fbad
Diffstat (limited to 'ojluni/annotations/hiddenapi/java/util/TimerTask.java')
0 files changed, 0 insertions, 0 deletions