| commit | 1e89a338bb0758ea4150c895220d4def596dc15d | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Jan 11 14:12:48 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 11 14:12:48 2024 +0000 |
| tree | e31590ac205e4b59cc9b3804f69091bdf3399e4e | |
| parent | 6fe473689e98d86d9f684a6a90a3f688b2faf965 [diff] | |
| parent | 4ca084bad6631fbe461c7c39c9a9eeabac771f43 [diff] |
Merge changes from topic "import_v121_0_6103_2" into main am: 4ca084bad6 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2893184 Change-Id: I55ef5d2683b3c7585234d3bfba9291fbf33ffc37 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Cronet/tests/mts/jarjar_excludes.txt b/Cronet/tests/mts/jarjar_excludes.txt index a0ce5c2..fd0a0f6 100644 --- a/Cronet/tests/mts/jarjar_excludes.txt +++ b/Cronet/tests/mts/jarjar_excludes.txt
@@ -17,4 +17,5 @@ org\.chromium\.net\.NativeTestServer(\$.+)? org\.chromium\.net\.MockUrlRequestJobFactory(\$.+)? org\.chromium\.net\.QuicTestServer(\$.+)? -org\.chromium\.net\.MockCertVerifier(\$.+)? \ No newline at end of file +org\.chromium\.net\.MockCertVerifier(\$.+)? +org\.chromium\.net\.LogcatCapture(\$.+)? \ No newline at end of file