| commit | 062a1f9a5e24b76e85e004f4f32fe143473888d3 | [log] [tgz] |
|---|---|---|
| author | Pete Bentley <prb@google.com> | Mon Sep 25 11:39:40 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 25 11:39:40 2023 +0000 |
| tree | 62dd87318f794f20dce429394a6f2e8a4bcb5999 | |
| parent | 9b8a2d16bfedbd9727ca0ff2713b0c2450a8a39f [diff] | |
| parent | 2ff13fb909dddfdaa6c1d6819d3174c5511e21e8 [diff] |
Merge "Fix up NetworkSecurityConfigTests." into main am: 950306478a am: d965c5deae am: 4d191bf9ac am: 2ff13fb909 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2750902 Change-Id: I2403f17f250c02e7c696bec060ab294fff066cf4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>