commit | 9d0057edb681edc33cd5bde653791af3b87f50b5 | [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 | 64a23ac93d46e7563df67d96e039acca877634ab | |
parent | 530356c5bc8205968ae0f5dd1826bcdb4d9196bc [diff] | |
parent | b139c0e716134b5b16c185f8795746afa0aee86b [diff] |
Merge "Fix testLegacyLockdownVpn flaky" am: 7151f51c5a am: e965720924 am: b139c0e716 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659998 Change-Id: Ib3ec17315225e4f0ed173d4d17165b8f21e07acb