summaryrefslogtreecommitdiff
path: root/ojluni/annotations/hiddenapi/java/util/TimerTask.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-30 18:45:25 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-30 18:45:25 +0000
commit4ecb654da9d12815652417c771caab8420040e11 (patch)
tree3047d433583c2fb1beb97e04ad621a5c198228e2 /ojluni/annotations/hiddenapi/java/util/TimerTask.java
parenta3107e916da4a4faa6034471d86f6b09885f8cae (diff)
parent7c2d068af6e48e4180d36c65b76c4d36868eae13 (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 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: I49135d44a7c5c24da42271b354608d27b8c94d44
Diffstat (limited to 'ojluni/annotations/hiddenapi/java/util/TimerTask.java')
0 files changed, 0 insertions, 0 deletions