| commit | 4669adc23ac28988ecd8067bce21f5c1b377faec | [log] [tgz] |
|---|---|---|
| author | Xinyi Zhou <zxy@google.com> | Thu Sep 22 03:26:31 2022 +0000 |
| committer | Xinyi Zhou <zxy@google.com> | Fri Sep 23 05:33:52 2022 +0000 |
| tree | 4ebe94c73ac04d8d3e14f48b178a588bdbf31803 | |
| parent | 686c1c5b50ec522f79a5f298b72f96e6d664cbf2 [diff] | |
| parent | 296247904a236db0ac5b14e0dda82b916e24c571 [diff] |
[conflict] Merge "[CTS] Fix CTS failure in mainline train" into android13-tests-dev am: 2d3df1b225 am: b1391d5d15 am: f460f6143b am: aabdbafcfe am: 311de7301c am: 296247904a Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2222423 Change-Id: Ic9b6191509cadf0ca15a7075a0f0d675e2f0c6a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Ignore-AOSP-First: resolve merge conflict from AOSP Fix: 248151186