| commit | 4d191bf9ac0fb3c8b35cde8f684dba54120984bd | [log] [tgz] |
|---|---|---|
| author | Pete Bentley <prb@google.com> | Mon Sep 25 10:04:59 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 25 10:04:59 2023 +0000 |
| tree | 08e4fa3b2aeb4983e2c33aad52235aa87a0be577 | |
| parent | 7563b242888e818b5f9e30b130355868095c7691 [diff] | |
| parent | d965c5deae25742031893a9c6a36a4256f59c625 [diff] |
Merge "Fix up NetworkSecurityConfigTests." into main am: 950306478a am: d965c5deae Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2750902 Change-Id: Id3c0182a4f336a33cc50d06f2796356e67023961 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>