diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-13 20:57:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-13 20:57:39 +0000 |
| commit | 012ae97680e161a31fd3ca94376ca1771ff0f3fc (patch) | |
| tree | 93f6efe40702d4e75789284abf91c2b776a94e46 /jsr166-tests/src/test/java/jsr166/ThreadLocalTest.java | |
| parent | 81a49709c7150384e48ca0bbd67154503d5d574c (diff) | |
| parent | f79b99d03000524706b5f2d8259058d2ed95ad2d (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 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: Id28cb4e0b2ac31f08bd272956f7c7e054692571a
Diffstat (limited to 'jsr166-tests/src/test/java/jsr166/ThreadLocalTest.java')
0 files changed, 0 insertions, 0 deletions