commit | b139c0e716134b5b16c185f8795746afa0aee86b | [log] [tgz] |
---|---|---|
author | Chalard Jean <jchalard@google.com> | Thu Apr 01 09:22:48 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 01 09:22:48 2021 +0000 |
tree | d5f0dda923d4dceabb79eaeaf59f44e48bfe8cfb | |
parent | 31657c49900d60a06ccaf9b16c3aa193d4f47280 [diff] | |
parent | e9657209245f9b10474b081876a85c69f57cad3a [diff] |
Merge "Fix testLegacyLockdownVpn flaky" am: 7151f51c5a am: e965720924 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659998 Change-Id: If5e7a4038b58b3beb52c517cfa1208cf08fcac2a