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