commit | 6c634f5c3e2dc19ec3fb7741952ce7491d3330e0 | [log] [tgz] |
---|---|---|
author | Oli Lan <olilan@google.com> | Wed Jan 18 16:14:04 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 18 16:14:04 2023 +0000 |
tree | 059a86204ba74aa223cb820ca2fbda5d4744f96d | |
parent | 6f367e02a2717b34fe198ffe448570ebc4090a22 [diff] | |
parent | cf200064fec7e8bee32293e28a9699337ee92414 [diff] |
Merge changes from topic "lockdownvpnmainuser" am: 30eb737996 am: cf200064fe Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2378890 Change-Id: I5f438a810a44ba290c9d9b416a597a7d1f2daeaa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>