diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 19:12:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 19:12:53 +0000 |
| commit | bb39e4db98ca20f2b32350319c2cafdb4f65a9f8 (patch) | |
| tree | f2a06f5d94278abe39fcb6eb95caa2a7c0c2a88b /ojluni/annotations/hiddenapi/java/util/TimerTask.java | |
| parent | c68b65f522868efec45dc19296f51f5e8d777b12 (diff) | |
| parent | 83d01084b9c729b9f1aece3ef225a60e2bd752fa (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: 83d01084b9 -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: I3425ac82d1eea9afb6ed58c44e80a70e46e08a38
Diffstat (limited to 'ojluni/annotations/hiddenapi/java/util/TimerTask.java')
0 files changed, 0 insertions, 0 deletions