diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2020-06-25 23:44:13 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-25 23:44:13 +0000 |
commit | d718b35915bc8e9be9ca0f1729d8ffe0b3bfe1b2 (patch) | |
tree | d9a5a021a40216005c704aee4a55752915b781d8 /ojluni/annotations/hiddenapi/java/util/TimerTask.java | |
parent | 0695b8ab581fada340de187c589a0dba00ea7427 (diff) | |
parent | c4e3a113a7c66f8c86041e6a45e2d0aec1731a39 (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 skipped: 6543d6ed08 skipped: a5a1744f72 skipped: 6ccb644512 am: c4e3a113a7 -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: Ib3a250786c62436426c41bc0bf66bfe9b6afcabc
Diffstat (limited to 'ojluni/annotations/hiddenapi/java/util/TimerTask.java')
0 files changed, 0 insertions, 0 deletions