| commit | 4ebc0197f200bee3607f259e3e17635d64fcbc7c | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Thu Apr 01 10:10:39 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 01 10:10:39 2021 +0000 |
| tree | ba7319d0fd4b2b3283f4b3fb39159ac9be3d38ee | |
| parent | 86b272d81d4a1d05fa1da50b895fa952543eabc3 [diff] | |
| parent | 4ac82f64c9e8ef56a94989f2ce13c8966d12aa91 [diff] |
Merge "Fix testLegacyLockdownVpn flaky" am: 58b8d1eb22 am: b08d1c3095 am: 4ac82f64c9 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659998 Change-Id: Ib3ec17315225e4f0ed173d4d17165b8f21e07acb