diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-13 21:27:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-13 21:27:22 +0000 |
| commit | 9cc0d834405c169016015dcc9b6336b5dd4d7eba (patch) | |
| tree | 49e4df40dae9a4dc7f4e5827a1e120740fa7b685 /ojluni/annotations/hiddenapi/java/util/TimerTask.java | |
| parent | 99e01aa50f59b20f30c8473d301449dc7a5f641a (diff) | |
| parent | 012ae97680e161a31fd3ca94376ca1771ff0f3fc (diff) | |
Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Track behavior change in default HostnameVerifier." into oreo-mr1-cts-dev am: e79d676601 -s ours" into pie-cts-dev am: f79b99d030 -s ours am: 012ae97680 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/libcore/+/1547918
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I039b060ea930a12a347b67d90e28d16d9ac29b65
Diffstat (limited to 'ojluni/annotations/hiddenapi/java/util/TimerTask.java')
0 files changed, 0 insertions, 0 deletions